diff --git a/.clang-tidy b/.clang-tidy
index 4073b9ae387392..a518d9cea0fd9b 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -24,6 +24,7 @@ Checks: >
   -bugprone-multi-level-implicit-pointer-conversion,
   -bugprone-narrowing-conversions,
   -bugprone-not-null-terminated-result,
+  -bugprone-pointer-arithmetic-on-polymorphic-object,
   -bugprone-reserved-identifier,
   -bugprone-signed-char-misuse,
   -bugprone-suspicious-include,
@@ -45,6 +46,7 @@ Checks: >
   -clang-analyzer-security.insecureAPI.rand,
   -clang-analyzer-security.insecureAPI.strcpy,
   -clang-analyzer-unix.Malloc,
-  -clang-diagnostic-implicit-int-conversion
+  -clang-diagnostic-implicit-int-conversion,
+  -clang-diagnostic-missing-template-arg-list-after-template-kw
 WarningsAsErrors: '*'
 HeaderFilterRegex: '(src|examples|zzz_generated|credentials).*(?<!third_party.*repo)'
diff --git a/examples/platform/ameba/pw_sys_io/sys_io_ameba.cc b/examples/platform/ameba/pw_sys_io/sys_io_ameba.cc
index f7b622861bee4f..98e2ac27990aa2 100644
--- a/examples/platform/ameba/pw_sys_io/sys_io_ameba.cc
+++ b/examples/platform/ameba/pw_sys_io/sys_io_ameba.cc
@@ -69,7 +69,7 @@ Status WriteByte(std::byte b)
 }
 
 // Writes a string using pw::sys_io, and add newline characters at the end.
-StatusWithSize WriteLine(const std::string_view & s)
+StatusWithSize WriteLine(std::string_view s)
 {
     size_t chars_written  = 0;
     StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
diff --git a/examples/platform/bouffalolab/common/rpc/pw_sys_io/sys_io.cc b/examples/platform/bouffalolab/common/rpc/pw_sys_io/sys_io.cc
index 5da8547c93155c..b7212e48ad8a5f 100644
--- a/examples/platform/bouffalolab/common/rpc/pw_sys_io/sys_io.cc
+++ b/examples/platform/bouffalolab/common/rpc/pw_sys_io/sys_io.cc
@@ -42,7 +42,7 @@ Status WriteByte(std::byte b)
 }
 
 // Writes a string using pw::sys_io, and add newline characters at the end.
-StatusWithSize WriteLine(const std::string_view & s)
+StatusWithSize WriteLine(std::string_view s)
 {
     size_t chars_written  = 0;
     StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
diff --git a/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc b/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc
index 8d3b1c230a29d0..2e1bea53ef3457 100644
--- a/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc
+++ b/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc
@@ -93,7 +93,7 @@ Status WriteByte(std::byte b)
 }
 
 // Writes a string using pw::sys_io, and add newline characters at the end.
-StatusWithSize WriteLine(const std::string_view & s)
+StatusWithSize WriteLine(std::string_view s)
 {
     size_t chars_written  = 0;
     StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
diff --git a/examples/platform/mbed/pw_sys_io/sys_io_mbed.cpp b/examples/platform/mbed/pw_sys_io/sys_io_mbed.cpp
index 1a753e8e7a71c3..d0fdbe5b49cc1b 100644
--- a/examples/platform/mbed/pw_sys_io/sys_io_mbed.cpp
+++ b/examples/platform/mbed/pw_sys_io/sys_io_mbed.cpp
@@ -57,7 +57,7 @@ Status WriteByte(std::byte b)
 }
 
 // Writes a string using pw::sys_io, and add newline characters at the end.
-StatusWithSize WriteLine(const std::string_view & s)
+StatusWithSize WriteLine(std::string_view s)
 {
     size_t chars_written  = 0;
     StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
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 1eaffe9ac8bcb6..5f9705a37ea763 100644
--- a/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc
+++ b/examples/platform/nrfconnect/pw_sys_io/sys_io_nrfconnect.cc
@@ -58,7 +58,7 @@ Status WriteByte(std::byte b)
 }
 
 // Writes a string using pw::sys_io, and add newline characters at the end.
-StatusWithSize WriteLine(const std::string_view & s)
+StatusWithSize WriteLine(std::string_view s)
 {
     size_t chars_written  = 0;
     StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
diff --git a/examples/platform/nxp/pw_sys_io/sys_io_nxp.cc b/examples/platform/nxp/pw_sys_io/sys_io_nxp.cc
index 8e729f0986bbb3..7f1479041533a5 100644
--- a/examples/platform/nxp/pw_sys_io/sys_io_nxp.cc
+++ b/examples/platform/nxp/pw_sys_io/sys_io_nxp.cc
@@ -60,7 +60,7 @@ Status WriteByte(std::byte b)
 }
 
 // Writes a string using pw::sys_io, and add newline characters at the end.
-StatusWithSize WriteLine(const std::string_view & s)
+StatusWithSize WriteLine(std::string_view s)
 {
     size_t chars_written  = 0;
     StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
diff --git a/examples/platform/qpg/pw_sys_io/sys_io_qpg.cc b/examples/platform/qpg/pw_sys_io/sys_io_qpg.cc
index e53b9c0091e113..96e6048b642943 100644
--- a/examples/platform/qpg/pw_sys_io/sys_io_qpg.cc
+++ b/examples/platform/qpg/pw_sys_io/sys_io_qpg.cc
@@ -58,7 +58,7 @@ Status WriteByte(std::byte b)
 }
 
 // Writes a string using pw::sys_io, and add newline characters at the end.
-StatusWithSize WriteLine(const std::string_view & s)
+StatusWithSize WriteLine(std::string_view s)
 {
     size_t chars_written  = 0;
     StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
diff --git a/examples/platform/silabs/pw_sys_io/sys_io_silabs.cc b/examples/platform/silabs/pw_sys_io/sys_io_silabs.cc
index 4bc7d98f7477c4..0969bb5875ca5c 100644
--- a/examples/platform/silabs/pw_sys_io/sys_io_silabs.cc
+++ b/examples/platform/silabs/pw_sys_io/sys_io_silabs.cc
@@ -63,7 +63,7 @@ Status WriteByte(std::byte b)
 }
 
 // Writes a string using pw::sys_io, and add newline characters at the end.
-StatusWithSize WriteLine(const std::string_view & s)
+StatusWithSize WriteLine(std::string_view s)
 {
     size_t chars_written  = 0;
     StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
diff --git a/examples/platform/telink/pw_sys_io/sys_io_telink.cc b/examples/platform/telink/pw_sys_io/sys_io_telink.cc
index 4241e191110cea..5ff35dbf7b6f6a 100644
--- a/examples/platform/telink/pw_sys_io/sys_io_telink.cc
+++ b/examples/platform/telink/pw_sys_io/sys_io_telink.cc
@@ -73,7 +73,7 @@ Status WriteByte(std::byte b)
 }
 
 // Writes a string using pw::sys_io, and add newline characters at the end.
-StatusWithSize WriteLine(const std::string_view & s)
+StatusWithSize WriteLine(std::string_view s)
 {
     size_t chars_written  = 0;
     StatusWithSize result = WriteBytes(pw::as_bytes(pw::span(s)));
diff --git a/examples/tv-casting-app/tv-casting-common/core/Command.h b/examples/tv-casting-app/tv-casting-common/core/Command.h
index b3e3e44ec50457..3f1a2abfbcba7b 100644
--- a/examples/tv-casting-app/tv-casting-common/core/Command.h
+++ b/examples/tv-casting-app/tv-casting-common/core/Command.h
@@ -65,7 +65,7 @@ class Command
 
                     // Invoke command
                     MediaClusterBase cluster(exchangeMgr, sessionHandle, _commandContext->mEndpoint->GetId());
-                    CHIP_ERROR err = cluster.template InvokeCommand(
+                    CHIP_ERROR err = cluster.template InvokeCommand<RequestType>(
                         _commandContext->mRequest, _commandContext,
                         // Command success handler
                         [](void * __context, const typename RequestType::ResponseType & response) {
@@ -146,6 +146,6 @@ struct CommandContext
     chip::Optional<uint16_t> mTimedInvokeTimeoutMs;
 };
 
-}; // namespace core
-}; // namespace casting
-}; // namespace matter
+} // namespace core
+} // namespace casting
+} // namespace matter
diff --git a/scripts/run-clang-tidy-on-compile-commands.py b/scripts/run-clang-tidy-on-compile-commands.py
index d9dc6cdcfa374e..407caaa6f490a5 100755
--- a/scripts/run-clang-tidy-on-compile-commands.py
+++ b/scripts/run-clang-tidy-on-compile-commands.py
@@ -85,6 +85,15 @@ def __init__(self, json_entry, gcc_sysroot=None):
         command_items = shlex.split(command)
         compiler = os.path.basename(command_items[0])
 
+        # Clang-tidy complains about "unused argument '-c'"
+        # We could disable that with something like
+        #
+        #    self.clang_arguments.append("-Wno-unused-command-line-argument")
+        #
+        # However that seems to potentially disable a lot, so for now just filter out the
+        # offending argument
+        command_items = [arg for arg in command_items if arg not in {'-c', '-S'}]
+
         # Allow gcc/g++ invocations to also be tidied - arguments should be
         # compatible and on darwin gcc/g++ is actually a symlink to clang
         if compiler in ['clang++', 'clang', 'gcc', 'g++']:
diff --git a/scripts/run_codegen_targets.sh b/scripts/run_codegen_targets.sh
index 03baee38df88cf..df235a26993f71 100755
--- a/scripts/run_codegen_targets.sh
+++ b/scripts/run_codegen_targets.sh
@@ -54,3 +54,9 @@ for name in $(ninja -C "$OUT_DIR" -t targets | grep -E 'dbus.*codegen:' | sed 's
     echo "Generating $name ..."
     ninja -C "$OUT_DIR" "$name"
 done
+
+# TLV decoding metadata
+for name in $(ninja -C "$OUT_DIR" -t targets | grep -E '_generate' | sed 's/: .*//'); do
+    echo "Generating $name ..."
+    ninja -C "$OUT_DIR" "$name"
+done
diff --git a/scripts/setup/bootstrap.sh b/scripts/setup/bootstrap.sh
index af71eb9b1cfefe..ce3ab42dd56c79 100644
--- a/scripts/setup/bootstrap.sh
+++ b/scripts/setup/bootstrap.sh
@@ -133,10 +133,15 @@ _bootstrap_or_activate() {
     export PW_DOCTOR_SKIP_CIPD_CHECKS=1
     export PATH # https://bugs.chromium.org/p/pigweed/issues/detail?id=281
 
-    local _PIGWEED_CIPD_JSON="$_CHIP_ROOT/third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json"
+    local _PIGWEED_CIPD_JSON_ROOT="$_CHIP_ROOT/third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup"
+    local _PIGWEED_CIPD_JSON="$_PIGWEED_CIPD_JSON_ROOT/pigweed.json"
+    local _PYTHON_CIPD_JSON="$_PIGWEED_CIPD_JSON_ROOT/python311.json"
     mkdir -p "$_PW_ACTUAL_ENVIRONMENT_ROOT"
     local _GENERATED_PIGWEED_CIPD_JSON="$_PW_ACTUAL_ENVIRONMENT_ROOT/pigweed.json"
-    $_CHIP_ROOT/scripts/setup/gen_pigweed_cipd_json.py -i $_PIGWEED_CIPD_JSON -o $_GENERATED_PIGWEED_CIPD_JSON
+    $_CHIP_ROOT/scripts/setup/gen_pigweed_cipd_json.py \
+        -i $_PIGWEED_CIPD_JSON                         \
+        -o $_GENERATED_PIGWEED_CIPD_JSON               \
+        -e darwin:$_PYTHON_CIPD_JSON
 
     if test -n "$GITHUB_ACTION"; then
         tee <<EOF >"${_PW_ACTUAL_ENVIRONMENT_ROOT}/pip.conf"
diff --git a/scripts/setup/gen_pigweed_cipd_json.py b/scripts/setup/gen_pigweed_cipd_json.py
index c5cf6d95cbcba5..d1a47fe2cef7be 100755
--- a/scripts/setup/gen_pigweed_cipd_json.py
+++ b/scripts/setup/gen_pigweed_cipd_json.py
@@ -16,6 +16,7 @@
 
 import argparse
 import json
+import platform
 
 _LIST_OF_PACKAGES_TO_EXCLUDE = ['fuchsia/third_party/rust/']
 
@@ -32,12 +33,26 @@ def include_package(package: dict) -> bool:
     return True
 
 
-def generate_new_cipd_package_json(input, output):
+def generate_new_cipd_package_json(input, output, extra):
     with open(input) as ins:
         packages = json.load(ins)
+
         file_packages = packages.get('packages')
         new_file_packages = [x for x in file_packages if include_package(x)]
 
+    # Extra is a list of platform:json.
+    # Filter it for the given platform and append any resulting packages
+    my_platform = platform.system().lower()
+    for item in extra:
+        inject_platform, path = item.split(':', 1)
+
+        if inject_platform.lower() != my_platform:
+            continue
+
+        with open(path) as ins:
+            for package in json.load(ins).get('packages'):
+                new_file_packages.append(package)
+
     new_packages = {'packages': new_file_packages}
     with open(output, 'w') as f:
         json.dump(new_packages, f, indent=2)
@@ -54,6 +69,11 @@ def main():
     parser.add_argument(
         '--output', '-o', required=True
     )
+    parser.add_argument(
+        '--extra', '-e', nargs='*', default=[],
+        help="Inject extra packages for specific platforms. Format is <platform>:<path_to_json>"
+    )
+
     generate_new_cipd_package_json(**vars(parser.parse_args()))
 
 
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
index cc52961a0aa087..08215244b039aa 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
@@ -33,112 +33,281 @@
         /* Endpoint: 0, Cluster: Localization Configuration (server), big-endian */                                                \
                                                                                                                                    \
         /* 0 - ActiveLocale, */                                                                                                    \
-        5, 'e', 'n', '-', 'U', 'S',                                                                                                \
+        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: Scenes Management (server), big-endian */                                                         \
+                                                                                                                                   \
+        /* 27 - LastConfiguredBy, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Valve Configuration and Control (server), big-endian */                                           \
+                                                                                                                                   \
+        /* 35 - AutoCloseTime, */                                                                                                  \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Unit Testing (server), big-endian */                                                              \
+                                                                                                                                   \
+        /* 43 - bitmap64, */                                                                                                       \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 51 - int40u, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 56 - int48u, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 62 - int56u, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 69 - int64u, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 77 - int40s, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 82 - int48s, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 88 - int56s, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 95 - int64s, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 103 - float_double, */                                                                                                  \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 111 - epoch_us, */                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 119 - nullable_bitmap64, */                                                                                             \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 127 - nullable_int40u, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 132 - nullable_int48u, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 138 - nullable_int56u, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 145 - nullable_int64u, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 153 - nullable_int40s, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 158 - nullable_int48s, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 164 - nullable_int56s, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 171 - nullable_int64s, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 179 - nullable_float_double, */                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* Endpoint: 2, Cluster: Power Source (server), big-endian */                                                              \
+                                                                                                                                   \
+        /* 187 - Description, */                                                                                                   \
+        2,                                                                                                                         \
+        'B',                                                                                                                       \
+        '3',                                                                                                                       \
+                                                                                                                                   \
+        /* Endpoint: 2, Cluster: Scenes Management (server), big-endian */                                                         \
+                                                                                                                                   \
+        /* 190 - LastConfiguredBy, */                                                                                              \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
                                                                                                                                    \
-            /* 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: Scenes Management (server), big-endian */                                                     \
-                                                                                                                                   \
-            /* 27 - LastConfiguredBy, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Valve Configuration and Control (server), big-endian */                                       \
-                                                                                                                                   \
-            /* 35 - AutoCloseTime, */                                                                                              \
-            0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Unit Testing (server), big-endian */                                                          \
-                                                                                                                                   \
-            /* 43 - bitmap64, */                                                                                                   \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 51 - int40u, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
-                                                                                                                                   \
-            /* 56 - int48u, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
-                                                                                                                                   \
-            /* 62 - int56u, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 69 - int64u, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 77 - int40s, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
-                                                                                                                                   \
-            /* 82 - int48s, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
-                                                                                                                                   \
-            /* 88 - int56s, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 95 - int64s, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 103 - float_double, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 111 - epoch_us, */                                                                                                  \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 119 - nullable_bitmap64, */                                                                                         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 127 - nullable_int40u, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
-                                                                                                                                   \
-            /* 132 - nullable_int48u, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
-                                                                                                                                   \
-            /* 138 - nullable_int56u, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 145 - nullable_int64u, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 153 - nullable_int40s, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
-                                                                                                                                   \
-            /* 158 - nullable_int48s, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
-                                                                                                                                   \
-            /* 164 - nullable_int56s, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 171 - nullable_int64s, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 179 - nullable_float_double, */                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 2, Cluster: Power Source (server), big-endian */                                                          \
-                                                                                                                                   \
-            /* 187 - Description, */                                                                                               \
-            2, 'B', '3',                                                                                                           \
-                                                                                                                                   \
-            /* Endpoint: 2, Cluster: Scenes Management (server), big-endian */                                                     \
-                                                                                                                                   \
-            /* 190 - LastConfiguredBy, */                                                                                          \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
     }
 
 #else // !CHIP_CONFIG_BIG_ENDIAN_TARGET
@@ -148,112 +317,281 @@
         /* 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: Scenes Management (server), little-endian */                                                  \
-                                                                                                                                   \
-            /* 27 - LastConfiguredBy, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Valve Configuration and Control (server), little-endian */                                    \
-                                                                                                                                   \
-            /* 35 - AutoCloseTime, */                                                                                              \
-            0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Unit Testing (server), little-endian */                                                       \
-                                                                                                                                   \
-            /* 43 - bitmap64, */                                                                                                   \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 51 - int40u, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
-                                                                                                                                   \
-            /* 56 - int48u, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
-                                                                                                                                   \
-            /* 62 - int56u, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 69 - int64u, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 77 - int40s, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
-                                                                                                                                   \
-            /* 82 - int48s, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
+        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: Scenes Management (server), little-endian */                                                      \
+                                                                                                                                   \
+        /* 27 - LastConfiguredBy, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Valve Configuration and Control (server), little-endian */                                        \
+                                                                                                                                   \
+        /* 35 - AutoCloseTime, */                                                                                                  \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+        0xFF,                                                                                                                      \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Unit Testing (server), little-endian */                                                           \
+                                                                                                                                   \
+        /* 43 - bitmap64, */                                                                                                       \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 51 - int40u, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 56 - int48u, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 62 - int56u, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 69 - int64u, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 77 - int40s, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 82 - int48s, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 88 - int56s, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 95 - int64s, */                                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 103 - float_double, */                                                                                                  \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 111 - epoch_us, */                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 119 - nullable_bitmap64, */                                                                                             \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 127 - nullable_int40u, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 132 - nullable_int48u, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 138 - nullable_int56u, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 145 - nullable_int64u, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 153 - nullable_int40s, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 158 - nullable_int48s, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 164 - nullable_int56s, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 171 - nullable_int64s, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* 179 - nullable_float_double, */                                                                                         \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+                                                                                                                                   \
+        /* Endpoint: 2, Cluster: Power Source (server), little-endian */                                                           \
+                                                                                                                                   \
+        /* 187 - Description, */                                                                                                   \
+        2,                                                                                                                         \
+        'B',                                                                                                                       \
+        '3',                                                                                                                       \
+                                                                                                                                   \
+        /* Endpoint: 2, Cluster: Scenes Management (server), little-endian */                                                      \
+                                                                                                                                   \
+        /* 190 - LastConfiguredBy, */                                                                                              \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
                                                                                                                                    \
-            /* 88 - int56s, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 95 - int64s, */                                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 103 - float_double, */                                                                                              \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 111 - epoch_us, */                                                                                                  \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 119 - nullable_bitmap64, */                                                                                         \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 127 - nullable_int40u, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
-                                                                                                                                   \
-            /* 132 - nullable_int48u, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
-                                                                                                                                   \
-            /* 138 - nullable_int56u, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 145 - nullable_int64u, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 153 - nullable_int40s, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00,                                                                                          \
-                                                                                                                                   \
-            /* 158 - nullable_int48s, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                                    \
-                                                                                                                                   \
-            /* 164 - nullable_int56s, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                              \
-                                                                                                                                   \
-            /* 171 - nullable_int64s, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* 179 - nullable_float_double, */                                                                                     \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
-                                                                                                                                   \
-            /* Endpoint: 2, Cluster: Power Source (server), little-endian */                                                       \
-                                                                                                                                   \
-            /* 187 - Description, */                                                                                               \
-            2, 'B', '3',                                                                                                           \
-                                                                                                                                   \
-            /* Endpoint: 2, Cluster: Scenes Management (server), little-endian */                                                  \
-                                                                                                                                   \
-            /* 190 - LastConfiguredBy, */                                                                                          \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
     }
 
 #endif // CHIP_CONFIG_BIG_ENDIAN_TARGET
@@ -354,1649 +692,1602 @@
     {                                                                                                                              \
                                                                                                                                    \
         /* Endpoint: 0, Cluster: Groups (server) */                                                                                \
-        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 },        /* NameSupport */                                     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Descriptor (server) */                                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* DeviceTypeList */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* TagList */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Binding (server) */                                                                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Binding */                                 \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                         \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Access Control (server) */                                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ACL */                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Extension */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SubjectsPerAccessControlEntry */                                          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TargetsPerAccessControlEntry */                                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* AccessControlEntriesPerFabric */                   \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Basic Information (server) */                                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* DataModelRevision */                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorName */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorID */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductName */                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductID */                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* NodeLabel */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 3, ZAP_TYPE(CHAR_STRING),                                                           \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) |                                               \
-                  ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Location */                                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersion */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 65, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersionString */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersion */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 65, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersionString */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 17, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ManufacturingDate */                      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* PartNumber */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000D, 258, ZAP_TYPE(LONG_CHAR_STRING),                                                    \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductURL */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000E, 65, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductLabel */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000F, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SerialNumber */                           \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000010, 1, ZAP_TYPE(BOOLEAN),                                                             \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) |                                                       \
-                  ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LocalConfigDisabled */                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000012, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) },                       /* UniqueID */         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000013, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CapabilityMinima */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000014, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductAppearance */                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000015, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SpecificationVersion */                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) },                  /* MaxPathsPerInvoke */     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                           /* FeatureMap */            \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ClusterRevision */       \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                 /* DefaultOTAProviders */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 1, ZAP_TYPE(BOOLEAN), 0 },                          /* UpdatePossible */          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 1, ZAP_TYPE(ENUM8), 0 },                            /* UpdateState */             \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* UpdateStateProgress */     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                         /* FeatureMap */              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                           /* ClusterRevision */         \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Localization Configuration (server) */                                                        \
-            { ZAP_LONG_DEFAULTS_INDEX(0), 0x00000000, 36, ZAP_TYPE(CHAR_STRING),                                                   \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                               /* ActiveLocale */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedLocales */  \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Time Format Localization (server) */                                                          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                               \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* HourFormat */                                      \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                               \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ActiveCalendarType */                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* SupportedCalendarTypes */                          \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Unit Localization (server) */                                                                 \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(0), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                       \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* TemperatureUnit */   \
-            { ZAP_SIMPLE_DEFAULT(0x1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                             /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Power Source Configuration (server) */                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Sources */           \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Power Source (server) */                                                                      \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 },             /* Status */                                 \
-            { ZAP_SIMPLE_DEFAULT(3), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },             /* Order */                                  \
-            { ZAP_LONG_DEFAULTS_INDEX(6), 0x00000002, 61, ZAP_TYPE(CHAR_STRING), 0 }, /* Description */                            \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000000E, 1, ZAP_TYPE(ENUM8), 0 },             /* BatChargeLevel */                         \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000F, 1, ZAP_TYPE(BOOLEAN), 0 },             /* BatReplacementNeeded */                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(ENUM8), 0 },               /* BatReplaceability */                      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001F, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EndpointList */      \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: General Commissioning (server) */                                                             \
-            { ZAP_LONG_DEFAULTS_INDEX(9), 0x00000000, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Breadcrumb */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BasicCommissioningInfo */                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RegulatoryConfig */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LocationCapability */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* SupportsConcurrentConnection */                    \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Network Commissioning (server) */                                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U), 0 },                                    /* MaxNetworks */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Networks */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), 0 },                              /* ScanMaxTimeSeconds */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), 0 },                              /* ConnectMaxTimeSeconds */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* InterfaceEnabled */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* LastNetworkingStatus */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(OCTET_STRING), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkID */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConnectErrorValue */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedWiFiBands */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 2, ZAP_TYPE(BITMAP16),                                                              \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedThreadFeatures */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ThreadVersion */    \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */       \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Diagnostic Logs (server) */                                                                   \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: General Diagnostics (server) */                                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NetworkInterfaces */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RebootCount */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* UpTime */           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TotalOperationalHours */                                                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BootReason */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveHardwareFaults */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveRadioFaults */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveNetworkFaults */                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TestEventTriggersEnabled */                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Software Diagnostics (server) */                                                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* ThreadMetrics */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapFree */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapUsed */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapHighWatermark */                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Channel */                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RoutingRole */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 17, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NetworkName */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PanId */                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ExtendedPanId */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 18, ZAP_TYPE(OCTET_STRING),                                                         \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* MeshLocalPrefix */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OverrunCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* NeighborTable */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* RouteTable */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PartitionId */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Weighting */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DataVersion */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StableDataVersion */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000D, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LeaderRouterId */                          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000E, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DetachedRoleCount */                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000F, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ChildRoleCount */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000010, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RouterRoleCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000011, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LeaderRoleCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000012, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AttachAttemptCount */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000013, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PartitionIdChangeCount */                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000014, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BetterPartitionAttachAttemptCount */                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000015, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ParentChangeCount */                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000016, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxTotalCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000017, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxUnicastCount */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000018, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBroadcastCount */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000019, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxAckRequestedCount */                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001A, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxAckedCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001B, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxNoAckRequestedCount */                                                  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001C, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDataCount */      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001D, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDataPollCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001E, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBeaconCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001F, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBeaconRequestCount */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000020, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxOtherCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000021, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxRetryCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000022, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDirectMaxRetryExpiryCount */                                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000023, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxIndirectMaxRetryExpiryCount */                                          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000024, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrCcaCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000025, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrAbortCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000026, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrBusyChannelCount */                                                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000027, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxTotalCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000028, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxUnicastCount */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000029, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBroadcastCount */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002A, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDataCount */      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002B, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDataPollCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002C, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBeaconCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002D, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBeaconRequestCount */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002E, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxOtherCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002F, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxAddressFilteredCount */                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000030, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDestAddrFilteredCount */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000031, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDuplicatedCount */                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000032, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrNoFrameCount */                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000033, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrUnknownNeighborCount */                                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000034, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrInvalidSrcAddrCount */                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000035, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrSecCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000036, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrFcsCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000037, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrOtherCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000038, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActiveTimestamp */                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000039, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PendingTimestamp */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000003A, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Delay */                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000003B, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SecurityPolicy */                          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000003C, 5, ZAP_TYPE(OCTET_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ChannelPage0Mask */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000003D, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OperationalDatasetComponents */            \
-            { ZAP_EMPTY_DEFAULT(), 0x0000003E, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                             /* ActiveNetworkFaultsList */                    \
-            { ZAP_SIMPLE_DEFAULT(0x000F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                 \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },        /* ClusterRevision */                            \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */                                                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 7, ZAP_TYPE(OCTET_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BSSID */                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SecurityType */                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* WiFiVersion */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ChannelNumber */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(INT8S),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RSSI */                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BeaconLostCount */                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BeaconRxCount */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketMulticastRxCount */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketMulticastTxCount */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketUnicastRxCount */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketUnicastTxCount */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentMaxRate */                          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OverrunCount */                            \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                         \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PHYRate */                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* FullDuplex */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PacketRxCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PacketTxCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrCount */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CollisionCount */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OverrunCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* CarrierDetect */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TimeSinceReset */   \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */       \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Time Synchronization (server) */                                                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 8, ZAP_TYPE(EPOCH_US),                                                              \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                       /* UTCTime */           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Granularity */       \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000002, 1, ZAP_TYPE(ENUM8), 0 },                               /* TimeSource */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* TrustedTimeSource */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 129, ZAP_TYPE(CHAR_STRING),                                                         \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                       /* DefaultNTP */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TimeZone */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DSTOffset */         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 8, ZAP_TYPE(EPOCH_US),                                                              \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LocalTime */                               \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 },            /* TimeZoneDatabase */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TimeZoneListMaxSize */                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                           /* DSTOffsetListMaxSize */                         \
-            { ZAP_SIMPLE_DEFAULT(true), 0x0000000C, 1, ZAP_TYPE(BOOLEAN), 0 },  /* SupportsDNSResolve */                           \
-            { ZAP_SIMPLE_DEFAULT(0x0B), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                   \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },      /* ClusterRevision */                              \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Administrator Commissioning (server) */                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX),                                                            \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */                           \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                         \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Operational Credentials (server) */                                                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NOCs */              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Fabrics */           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedFabrics */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CommissionedFabrics */                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TrustedRootCertificates */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* CurrentFabricIndex */                              \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Group Key Management (server) */                                                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                       /* GroupKeyMap */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* GroupTable */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupsPerFabric */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupKeysPerFabric */                                                  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LabelList */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: User Label (server) */                                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LabelList */                               \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                         \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* MeasuredValue */     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },      /* MinMeasuredValue */  \
-            { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */  \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 0, Cluster: Fault Injection (server) */                                                                   \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Identify (server) */                                                                          \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */      \
-            { ZAP_SIMPLE_DEFAULT(0x0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },                                /* IdentifyType */      \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Groups (server) */                                                                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 },    /* NameSupport */                                     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: On/Off (server) */                                                                            \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* OnOff */              \
-            { ZAP_SIMPLE_DEFAULT(0x01), 0x00004000, 1, ZAP_TYPE(BOOLEAN), 0 },                            /* GlobalSceneControl */ \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnTime */            \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OffWaitTime */       \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(1), 0x00004003, 1, ZAP_TYPE(ENUM8),                                                       \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                          \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) },                                 /* StartUpOnOff */                               \
-            { ZAP_SIMPLE_DEFAULT(0x0001), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                 \
-            { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },        /* ClusterRevision */                            \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Level Control (server) */                                                                     \
-            { ZAP_SIMPLE_DEFAULT(0xFE), 0x00000000, 1, ZAP_TYPE(INT8U),                                                            \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },    /* CurrentLevel */                                 \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000001, 2, ZAP_TYPE(INT16U), 0 }, /* RemainingTime */                                \
-            { ZAP_SIMPLE_DEFAULT(0x01), 0x00000002, 1, ZAP_TYPE(INT8U), 0 },    /* MinLevel */                                     \
-            { ZAP_SIMPLE_DEFAULT(0xFE), 0x00000003, 1, ZAP_TYPE(INT8U), 0 },    /* MaxLevel */                                     \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000004, 2, ZAP_TYPE(INT16U), 0 }, /* CurrentFrequency */                             \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000005, 2, ZAP_TYPE(INT16U), 0 }, /* MinFrequency */                                 \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000006, 2, ZAP_TYPE(INT16U), 0 }, /* MaxFrequency */                                 \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(2), 0x0000000F, 1, ZAP_TYPE(BITMAP8),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Options */                                          \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000010, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnOffTransitionTime */                                                            \
-            { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000011, 1, ZAP_TYPE(INT8U),                                                            \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnLevel */                                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000012, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnTransitionTime */                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000013, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OffTransitionTime */                               \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(3), 0x00000014, 1, ZAP_TYPE(INT8U),                                                       \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DefaultMoveRate */   \
-            { ZAP_SIMPLE_DEFAULT(255), 0x00004000, 1, ZAP_TYPE(INT8U),                                                             \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                        \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) },                            /* StartUpCurrentLevel */                             \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Descriptor (server) */                                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* DeviceTypeList */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* TagList */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Binding (server) */                                                                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Binding */                                 \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                         \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Actions (server) */                                                                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActionList */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EndpointLists */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 514, ZAP_TYPE(LONG_CHAR_STRING),                                                    \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                                                       /* SetupURL */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */       \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Power Source (server) */                                                                      \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 },              /* Status */                                \
-            { ZAP_SIMPLE_DEFAULT(2), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },              /* Order */                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(17), 0x00000002, 61, ZAP_TYPE(CHAR_STRING), 0 }, /* Description */                           \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000000E, 1, ZAP_TYPE(ENUM8), 0 },              /* BatChargeLevel */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000F, 1, ZAP_TYPE(BOOLEAN), 0 },              /* BatReplacementNeeded */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(ENUM8), 0 },                /* BatReplaceability */                     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001F, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EndpointList */      \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Switch (server) */                                                                            \
-            { ZAP_SIMPLE_DEFAULT(2), 0x00000000, 1, ZAP_TYPE(INT8U), 0 },    /* NumberOfPositions */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },      /* CurrentPosition */                                 \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Fixed Label (server) */                                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LabelList */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: User Label (server) */                                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LabelList */                               \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                         \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Boolean State (server) */                                                                     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(BOOLEAN), 0 },  /* StateValue */                                      \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Oven Cavity Operational State (server) */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PhaseList */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPhase */                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CountdownTime */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalStateList */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* OperationalState */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalError */ \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */       \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Oven Mode (server) */                                                                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },                                    /* CurrentMode */       \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Laundry Dryer Controls (server) */                                                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedDrynessLevels */                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SelectedDrynessLevel */                            \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Mode Select (server) */                                                                       \
-            { ZAP_LONG_DEFAULTS_INDEX(20), 0x00000000, 65, ZAP_TYPE(CHAR_STRING), 0 },                /* Description */            \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(ENUM16), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StandardNamespace */      \
-            { ZAP_SIMPLE_DEFAULT(255), 0xFFF10001, 1, ZAP_TYPE(INT8U), 0 },                           /* ManufacturerExtension */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */    \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },       /* CurrentMode */       \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000004, 1, ZAP_TYPE(INT8U),                                                               \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */      \
-            { ZAP_SIMPLE_DEFAULT(255), 0x00000005, 1, ZAP_TYPE(INT8U),                                                             \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */           \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */       \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Laundry Washer Mode (server) */                                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentMode */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */                                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Refrigerator And Temperature Controlled Cabinet Mode (server) */                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentMode */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */                                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Laundry Washer Controls (server) */                                                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SpinSpeeds */        \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(4), 0x00000001, 1, ZAP_TYPE(INT8U),                                                       \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SpinSpeedCurrent */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* NumberOfRinses */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedRinses */   \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: RVC Run Mode (server) */                                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* SupportedModes */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* CurrentMode */    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: RVC Clean Mode (server) */                                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* SupportedModes */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* CurrentMode */    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Temperature Control (server) */                                                               \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000004, 1, ZAP_TYPE(INT8U), 0 }, /* SelectedTemperatureLevel */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* SupportedTemperatureLevels */                      \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Refrigerator Alarm (server) */                                                                \
-            { ZAP_SIMPLE_DEFAULT(1), 0x00000000, 4, ZAP_TYPE(BITMAP32), 0 }, /* Mask */                                            \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 4, ZAP_TYPE(BITMAP32), 0 }, /* State */                                           \
-            { ZAP_SIMPLE_DEFAULT(1), 0x00000003, 4, ZAP_TYPE(BITMAP32), 0 }, /* Supported */                                       \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Dishwasher Mode (server) */                                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentMode */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */                                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Air Quality (server) */                                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* AirQuality */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Smoke CO Alarm (server) */                                                                    \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* ExpressedState */        \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* SmokeState */            \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* COState */               \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* BatteryAlert */          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* DeviceMuted */           \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000005, 1, ZAP_TYPE(BOOLEAN), 0 },                            /* TestInProgress */        \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000006, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* HardwareFaultAlert */    \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000007, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* EndOfServiceAlert */     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* InterconnectSmokeAlarm */                             \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 }, /* InterconnectCOAlarm */                                \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 }, /* ContaminationState */                                 \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(5), 0x0000000B, 1, ZAP_TYPE(ENUM8),                                                       \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* SmokeSensitivityLevel */                           \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000000C, 4, ZAP_TYPE(EPOCH_S), 0 },  /* ExpiryDate */                                      \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Dishwasher Alarm (server) */                                                                  \
-            { ZAP_SIMPLE_DEFAULT(1), 0x00000000, 4, ZAP_TYPE(BITMAP32), 0 },  /* Mask */                                           \
-            { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 4, ZAP_TYPE(BITMAP32), 0 },  /* Latch */                                          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 4, ZAP_TYPE(BITMAP32), 0 },  /* State */                                          \
-            { ZAP_SIMPLE_DEFAULT(15), 0x00000003, 4, ZAP_TYPE(BITMAP32), 0 }, /* Supported */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },  /* FeatureMap */                                     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },    /* ClusterRevision */                                \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Microwave Oven Mode (server) */                                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* SupportedModes */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* CurrentMode */    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Operational State (server) */                                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PhaseList */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPhase */                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CountdownTime */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalStateList */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* OperationalState */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalError */ \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */       \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: RVC Operational State (server) */                                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PhaseList */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPhase */                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CountdownTime */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalStateList */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* OperationalState */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalError */ \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */       \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Scenes Management (server) */                                                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(27), 0x00000000, 8, ZAP_TYPE(NODE_ID),                                                       \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) },                                                              /* LastConfiguredBy */  \
-            { ZAP_SIMPLE_DEFAULT(16), 0x00000001, 2, ZAP_TYPE(INT16U), 0 },                                /* SceneTableSize */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FabricSceneInfo */   \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: HEPA Filter Monitoring (server) */                                                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(PERCENT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Condition */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DegradationDirection */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ChangeIndication */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* InPlaceIndicator */                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(EPOCH_S),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastChangedTime */                                                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ReplacementProductList */                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Activated Carbon Filter Monitoring (server) */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(PERCENT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Condition */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DegradationDirection */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ChangeIndication */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* InPlaceIndicator */                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(EPOCH_S),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastChangedTime */                                                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ReplacementProductList */                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Boolean State Configuration (server) */                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* CurrentSensitivityLevel */                 \
-            { ZAP_SIMPLE_DEFAULT(3), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },            /* SupportedSensitivityLevels */              \
-            { ZAP_SIMPLE_DEFAULT(2), 0x00000002, 1, ZAP_TYPE(INT8U), 0 },            /* DefaultSensitivityLevel */                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(BITMAP8), 0 },            /* AlarmsActive */                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BITMAP8), 0 },            /* AlarmsSuppressed */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* AlarmsEnabled */           \
-            { ZAP_SIMPLE_DEFAULT(0x03), 0x00000006, 1, ZAP_TYPE(BITMAP8), 0 },                       /* AlarmsSupported */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000007, 2, ZAP_TYPE(BITMAP16), 0 },                         /* SensorFault */             \
-            { ZAP_SIMPLE_DEFAULT(0x0F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                      /* FeatureMap */              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                           /* ClusterRevision */         \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Valve Configuration and Control (server) */                                                   \
-            { ZAP_SIMPLE_DEFAULT(0xFFFFFFFF), 0x00000000, 4, ZAP_TYPE(ELAPSED_S),                                                  \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OpenDuration */                                                                   \
-            { ZAP_SIMPLE_DEFAULT(0xFFFFFFFF), 0x00000001, 4, ZAP_TYPE(ELAPSED_S),                                                  \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                        \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DefaultOpenDuration */                                                        \
-            { ZAP_LONG_DEFAULTS_INDEX(35), 0x00000002, 8, ZAP_TYPE(EPOCH_US), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AutoCloseTime */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                      /* RemainingDuration */  \
-            { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* CurrentState */       \
-            { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000005, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* TargetState */        \
-            { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000006, 1, ZAP_TYPE(PERCENT), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentLevel */       \
-            { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000007, 1, ZAP_TYPE(PERCENT), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* TargetLevel */        \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(6), 0x00000008, 1, ZAP_TYPE(PERCENT),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* DefaultOpenLevel */  \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 2, ZAP_TYPE(BITMAP16), 0 },                               /* ValveFault */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000000A, 1, ZAP_TYPE(INT8U), 0 },                                  /* LevelStep */         \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Electrical Power Measurement (server) */                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PowerMode */         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NumberOfMeasurementTypes */                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Accuracy */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Ranges */            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(VOLTAGE_MV),                                                            \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Voltage */                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 8, ZAP_TYPE(AMPERAGE_MA),                                                           \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActiveCurrent */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(AMPERAGE_MA),                                                           \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ReactiveCurrent */                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 8, ZAP_TYPE(AMPERAGE_MA),                                                           \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ApparentCurrent */                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 8, ZAP_TYPE(POWER_MW),                                                              \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActivePower */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 8, ZAP_TYPE(POWER_MW),                                                              \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ReactivePower */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 8, ZAP_TYPE(POWER_MW),                                                              \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ApparentPower */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 8, ZAP_TYPE(VOLTAGE_MV),                                                            \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RMSVoltage */                              \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 8, ZAP_TYPE(AMPERAGE_MA),                                                           \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RMSCurrent */                              \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000D, 8, ZAP_TYPE(POWER_MW),                                                              \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RMSPower */                                \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000E, 8, ZAP_TYPE(INT64S),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Frequency */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000F, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* HarmonicCurrents */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000010, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* HarmonicPhases */                          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000011, 8, ZAP_TYPE(INT64S),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PowerFactor */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000012, 8, ZAP_TYPE(AMPERAGE_MA),                                                           \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                          /* NeutralCurrent */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Electrical Energy Measurement (server) */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Accuracy */         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CumulativeEnergyImported */                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CumulativeEnergyExported */                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeriodicEnergyImported */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeriodicEnergyExported */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CumulativeEnergyReset */                   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Device Energy Management (server) */                                                          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ESAType */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* ESACanGenerate */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ESAState */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 8, ZAP_TYPE(POWER_MW), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AbsMinPower */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(POWER_MW), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AbsMaxPower */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PowerAdjustmentCapability */               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                          /* Forecast */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* OptOutState */    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Energy EVSE (server) */                                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                       /* State */             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupplyState */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FaultState */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(EPOCH_S),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ChargingEnabledUntil */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 8, ZAP_TYPE(AMPERAGE_MA),                                                           \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CircuitCapacity */                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(AMPERAGE_MA),                                                           \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MinimumChargeCurrent */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 8, ZAP_TYPE(AMPERAGE_MA),                                                           \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaximumChargeCurrent */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 8, ZAP_TYPE(AMPERAGE_MA),                                                           \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* UserMaximumChargeCurrent */                \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* RandomizationDelayWindow */                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000023, 4, ZAP_TYPE(EPOCH_S),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NextChargeStartTime */                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000024, 4, ZAP_TYPE(EPOCH_S),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NextChargeTargetTime */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000025, 8, ZAP_TYPE(ENERGY_MWH),                                                            \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NextChargeRequiredEnergy */                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000026, 1, ZAP_TYPE(PERCENT),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NextChargeTargetSoC */                     \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(7), 0x00000027, 2, ZAP_TYPE(INT16U),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                  \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ApproximateEVEfficiency */                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000040, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SessionID */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000041, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SessionDuration */                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000042, 8, ZAP_TYPE(ENERGY_MWH),                                                            \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SessionEnergyCharged */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Energy Preference (server) */                                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EnergyBalances */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* CurrentEnergyBalance */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EnergyPriorities */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LowPowerModeSensitivities */                                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) },                                /* CurrentLowPowerModeSensitivity */                  \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Power Topology (server) */                                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AvailableEndpoints */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveEndpoints */   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Energy EVSE Mode (server) */                                                                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* SupportedModes */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* CurrentMode */    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Device Energy Management Mode (server) */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* SupportedModes */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* CurrentMode */    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 },    /* NameSupport */                                         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Descriptor (server) */                                                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* DeviceTypeList */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* TagList */            \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Binding (server) */                                                                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Binding */                                     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                             \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Access Control (server) */                                                                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ACL */                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Extension */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SubjectsPerAccessControlEntry */                                              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TargetsPerAccessControlEntry */                                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* AccessControlEntriesPerFabric */                       \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */      \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Basic Information (server) */                                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* DataModelRevision */                          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorName */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorID */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductName */                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductID */                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* NodeLabel */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 3, ZAP_TYPE(CHAR_STRING),                                                               \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Location */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersion */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 65, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersionString */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersion */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 65, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersionString */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000B, 17, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ManufacturingDate */                          \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000C, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* PartNumber */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000D, 258, ZAP_TYPE(LONG_CHAR_STRING),                                                        \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductURL */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000E, 65, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductLabel */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000F, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SerialNumber */                               \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000010, 1, ZAP_TYPE(BOOLEAN),                                                                 \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LocalConfigDisabled */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000012, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) },                       /* UniqueID */             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000013, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CapabilityMinima */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000014, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductAppearance */                          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000015, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SpecificationVersion */                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) },                  /* MaxPathsPerInvoke */         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                           /* FeatureMap */                \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ClusterRevision */           \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */                                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                 /* DefaultOTAProviders */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 1, ZAP_TYPE(BOOLEAN), 0 },                          /* UpdatePossible */              \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 1, ZAP_TYPE(ENUM8), 0 },                            /* UpdateState */                 \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* UpdateStateProgress */         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                         /* FeatureMap */                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                           /* ClusterRevision */             \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Localization Configuration (server) */                                                            \
+        { ZAP_LONG_DEFAULTS_INDEX(0), 0x00000000, 36, ZAP_TYPE(CHAR_STRING),                                                       \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                               /* ActiveLocale */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedLocales */      \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Time Format Localization (server) */                                                              \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                                   \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* HourFormat */                                          \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                   \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ActiveCalendarType */                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* SupportedCalendarTypes */                              \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Window Covering (server) */                                                                   \
-            { ZAP_SIMPLE_DEFAULT(0x08), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 },    /* Type */                                         \
-            { ZAP_SIMPLE_DEFAULT(0xFFFF), 0x00000001, 2, ZAP_TYPE(INT16U), 0 }, /* PhysicalClosedLimitLift */                      \
-            { ZAP_SIMPLE_DEFAULT(0xFFFF), 0x00000002, 2, ZAP_TYPE(INT16U), 0 }, /* PhysicalClosedLimitTilt */                      \
-            { ZAP_SIMPLE_DEFAULT(0x7FFF), 0x00000003, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPositionLift */                             \
-            { ZAP_SIMPLE_DEFAULT(0x7FFF), 0x00000004, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPositionTilt */                             \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000005, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* NumberOfActuationsLift */                                                         \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000006, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* NumberOfActuationsTilt */                                                         \
-            { ZAP_SIMPLE_DEFAULT(0x03), 0x00000007, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ConfigStatus */       \
-            { ZAP_SIMPLE_DEFAULT(50), 0x00000008, 1, ZAP_TYPE(PERCENT),                                                            \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPositionLiftPercentage */                   \
-            { ZAP_SIMPLE_DEFAULT(50), 0x00000009, 1, ZAP_TYPE(PERCENT),                                                            \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* CurrentPositionTiltPercentage */                 \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000A, 1, ZAP_TYPE(BITMAP8), 0 }, /* OperationalStatus */                             \
-            { ZAP_SIMPLE_DEFAULT(5000), 0x0000000B, 2, ZAP_TYPE(PERCENT100THS),                                                    \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* TargetPositionLiftPercent100ths */                                                \
-            { ZAP_SIMPLE_DEFAULT(5000), 0x0000000C, 2, ZAP_TYPE(PERCENT100THS),                                                    \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) },                                /* TargetPositionTiltPercent100ths */                 \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000D, 1, ZAP_TYPE(ENUM8), 0 }, /* EndProductType */                                  \
-            { ZAP_SIMPLE_DEFAULT(5000), 0x0000000E, 2, ZAP_TYPE(PERCENT100THS),                                                    \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPositionLiftPercent100ths */                \
-            { ZAP_SIMPLE_DEFAULT(5000), 0x0000000F, 2, ZAP_TYPE(PERCENT100THS),                                                    \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPositionTiltPercent100ths */                \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000010, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* InstalledOpenLimitLift */                                                         \
-            { ZAP_SIMPLE_DEFAULT(0xFFFF), 0x00000011, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* InstalledClosedLimitLift */                                                       \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000012, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* InstalledOpenLimitTilt */                                                         \
-            { ZAP_SIMPLE_DEFAULT(0xFFFF), 0x00000013, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* InstalledClosedLimitTilt */                                                       \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(8), 0x00000017, 1, ZAP_TYPE(BITMAP8),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Mode */              \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x0000001A, 2, ZAP_TYPE(BITMAP16), 0 },                            /* SafetyStatus */      \
-            { ZAP_SIMPLE_DEFAULT(0x17), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                            /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxPressure */              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxSpeed */                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxFlow */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinConstPressure */         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxConstPressure */         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinCompPressure */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxCompPressure */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinConstSpeed */            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxConstSpeed */            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinConstFlow */             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxConstFlow */             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinConstTemp */             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxConstTemp */             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000010, 2, ZAP_TYPE(BITMAP16), 0 },                          /* PumpStatus */               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000011, 1, ZAP_TYPE(ENUM8), 0 },                             /* EffectiveOperationMode */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000012, 1, ZAP_TYPE(ENUM8), 0 },                             /* EffectiveControlMode */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000013, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Capacity */                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000014, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Speed */                    \
-            { ZAP_SIMPLE_DEFAULT(0x000000), 0x00000015, 3, ZAP_TYPE(INT24U),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* LifetimeRunningHours */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000016, 3, ZAP_TYPE(INT24U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Power */                    \
-            { ZAP_SIMPLE_DEFAULT(0x00000000), 0x00000017, 4, ZAP_TYPE(INT32U),                                                     \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LifetimeEnergyConsumed */                          \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(9), 0x00000020, 1, ZAP_TYPE(ENUM8),                                                       \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OperationMode */                                    \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(10), 0x00000021, 1, ZAP_TYPE(ENUM8),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },     /* ControlMode */                                  \
-            { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                   \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },      /* ClusterRevision */                              \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Thermostat (server) */                                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(TEMPERATURE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LocalTemperature */    \
-            { ZAP_SIMPLE_DEFAULT(0x02BC), 0x00000003, 2, ZAP_TYPE(TEMPERATURE), 0 }, /* AbsMinHeatSetpointLimit */                 \
-            { ZAP_SIMPLE_DEFAULT(0x0BB8), 0x00000004, 2, ZAP_TYPE(TEMPERATURE), 0 }, /* AbsMaxHeatSetpointLimit */                 \
-            { ZAP_SIMPLE_DEFAULT(0x0640), 0x00000005, 2, ZAP_TYPE(TEMPERATURE), 0 }, /* AbsMinCoolSetpointLimit */                 \
-            { ZAP_SIMPLE_DEFAULT(0x0C80), 0x00000006, 2, ZAP_TYPE(TEMPERATURE), 0 }, /* AbsMaxCoolSetpointLimit */                 \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(11), 0x00000011, 2, ZAP_TYPE(TEMPERATURE),                                                \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OccupiedCoolingSetpoint */                          \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(12), 0x00000012, 2, ZAP_TYPE(TEMPERATURE),                                                \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OccupiedHeatingSetpoint */                          \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(13), 0x00000015, 2, ZAP_TYPE(TEMPERATURE),                                                \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MinHeatSetpointLimit */                             \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(14), 0x00000016, 2, ZAP_TYPE(TEMPERATURE),                                                \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MaxHeatSetpointLimit */                             \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(15), 0x00000017, 2, ZAP_TYPE(TEMPERATURE),                                                \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MinCoolSetpointLimit */                             \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(16), 0x00000018, 2, ZAP_TYPE(TEMPERATURE),                                                \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MaxCoolSetpointLimit */                             \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(17), 0x00000019, 1, ZAP_TYPE(INT8S),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MinSetpointDeadBand */                              \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(18), 0x0000001B, 1, ZAP_TYPE(ENUM8),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ControlSequenceOfOperation */                       \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(19), 0x0000001C, 1, ZAP_TYPE(ENUM8),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                                /* SystemMode */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000048, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PresetTypes */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000049, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ScheduleTypes */     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000004A, 1, ZAP_TYPE(INT8U), 0 },                                  /* NumberOfPresets */   \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000004B, 1, ZAP_TYPE(INT8U), 0 },                                  /* NumberOfSchedules */ \
-            { ZAP_SIMPLE_DEFAULT(0xFF), 0x0000004D, 1, ZAP_TYPE(INT8U),                                                            \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NumberOfScheduleTransitionPerDay */                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x0000004E, 17, ZAP_TYPE(OCTET_STRING),                                                         \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActivePresetHandle */                                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000004F, 17, ZAP_TYPE(OCTET_STRING),                                                         \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActiveScheduleHandle */                                                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000050, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Presets */                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000051, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Schedules */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000052, 4, ZAP_TYPE(EPOCH_S),                                                               \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) },                                     /* SetpointHoldExpiryTimestamp */                \
-            { ZAP_SIMPLE_DEFAULT(0x0023), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                 \
-            { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },        /* ClusterRevision */                            \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Fan Control (server) */                                                                       \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(20), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* FanMode */                                         \
-            { ZAP_SIMPLE_DEFAULT(0x02), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* FanModeSequence */                                 \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(21), 0x00000002, 1, ZAP_TYPE(PERCENT),                                                    \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PercentSetting */    \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(PERCENT), 0 },                             /* PercentCurrent */    \
-            { ZAP_SIMPLE_DEFAULT(100), 0x00000004, 1, ZAP_TYPE(INT8U), 0 },                                /* SpeedMax */          \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(22), 0x00000005, 1, ZAP_TYPE(INT8U),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SpeedSetting */      \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000006, 1, ZAP_TYPE(INT8U), 0 },                               /* SpeedCurrent */      \
-            { ZAP_SIMPLE_DEFAULT(0x03), 0x00000007, 1, ZAP_TYPE(BITMAP8), 0 },                             /* RockSupport */       \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000008, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* RockSetting */       \
-            { ZAP_SIMPLE_DEFAULT(0x03), 0x00000009, 1, ZAP_TYPE(BITMAP8), 0 },                             /* WindSupport */       \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000A, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* WindSetting */       \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000000B, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) },       /* AirflowDirection */  \
-            { ZAP_SIMPLE_DEFAULT(0x3F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                            /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */                                           \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(23), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* TemperatureDisplayMode */                           \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(24), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* KeypadLockout */                                    \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(25), 0x00000002, 1, ZAP_TYPE(ENUM8),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* ScheduleProgrammingVisibility */                   \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Color Control (server) */                                                                     \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* CurrentHue */        \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* CurrentSaturation */ \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000002, 2, ZAP_TYPE(INT16U), 0 },                            /* RemainingTime */     \
-            { ZAP_SIMPLE_DEFAULT(0x616B), 0x00000003, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentX */          \
-            { ZAP_SIMPLE_DEFAULT(0x607D), 0x00000004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentY */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), 0 },                                    /* DriftCompensation */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 255, ZAP_TYPE(CHAR_STRING), 0 },                            /* CompensationText */  \
-            { ZAP_SIMPLE_DEFAULT(0x00FA), 0x00000007, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) },                                /* ColorTemperatureMireds */                          \
-            { ZAP_SIMPLE_DEFAULT(0x01), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 }, /* ColorMode */                                       \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000F, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Options */            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* NumberOfPrimaries */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000011, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary1X */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000012, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary1Y */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000013, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary1Intensity */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000015, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary2X */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary2Y */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000017, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary2Intensity */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000019, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary3X */          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001A, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary3Y */          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001B, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary3Intensity */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000020, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary4X */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000021, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary4Y */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000022, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary4Intensity */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000024, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary5X */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000025, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary5Y */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000026, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary5Intensity */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000028, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary6X */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000029, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary6Y */          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002A, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary6Intensity */  \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(26), 0x00000030, 2, ZAP_TYPE(INT16U),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* WhitePointX */                                      \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(27), 0x00000031, 2, ZAP_TYPE(INT16U),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* WhitePointY */                                      \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(28), 0x00000032, 2, ZAP_TYPE(INT16U),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointRX */                                     \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(29), 0x00000033, 2, ZAP_TYPE(INT16U),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointRY */                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000034, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ColorPointRIntensity */                            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(30), 0x00000036, 2, ZAP_TYPE(INT16U),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointGX */                                     \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(31), 0x00000037, 2, ZAP_TYPE(INT16U),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointGY */                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000038, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ColorPointGIntensity */                            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(32), 0x0000003A, 2, ZAP_TYPE(INT16U),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointBX */                                     \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(33), 0x0000003B, 2, ZAP_TYPE(INT16U),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointBY */                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000003C, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ColorPointBIntensity */                            \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004000, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) },                                                           /* EnhancedCurrentHue */   \
-            { ZAP_SIMPLE_DEFAULT(0x01), 0x00004001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* EnhancedColorMode */    \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00004002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorLoopActive */      \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorLoopDirection */   \
-            { ZAP_SIMPLE_DEFAULT(0x0019), 0x00004004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorLoopTime */     \
-            { ZAP_SIMPLE_DEFAULT(0x2300), 0x00004005, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStartEnhancedHue */                    \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004006, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStoredEnhancedHue */                   \
-            { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000400A, 2, ZAP_TYPE(BITMAP16), 0 }, /* ColorCapabilities */                            \
-            { ZAP_SIMPLE_DEFAULT(0x009A), 0x0000400B, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMinMireds */                   \
-            { ZAP_SIMPLE_DEFAULT(0x01C6), 0x0000400C, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMaxMireds */                   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000400D, 2, ZAP_TYPE(INT16U), 0 },        /* CoupleColorTempToLevelMinMireds */              \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(34), 0x00004010, 2, ZAP_TYPE(INT16U),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                          \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) },                               /* StartUpColorTemperatureMireds */                \
-            { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                   \
-            { ZAP_SIMPLE_DEFAULT(7), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },      /* ClusterRevision */                              \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Ballast Configuration (server) */                                                             \
-            { ZAP_SIMPLE_DEFAULT(0x01), 0x00000000, 1, ZAP_TYPE(INT8U), 0 },   /* PhysicalMinLevel */                              \
-            { ZAP_SIMPLE_DEFAULT(0xFE), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },   /* PhysicalMaxLevel */                              \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* BallastStatus */                                 \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(35), 0x00000010, 1, ZAP_TYPE(INT8U),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MinLevel */                                         \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(36), 0x00000011, 1, ZAP_TYPE(INT8U),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MaxLevel */                                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000014, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* IntrinsicBallastFactor */                          \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(37), 0x00000015, 1, ZAP_TYPE(INT8U),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                         \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) },                       /* BallastFactorAdjustment */                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000020, 1, ZAP_TYPE(INT8U), 0 }, /* LampQuantity */                                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000030, 17, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LampType */           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000031, 17, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LampManufacturer */   \
-            { ZAP_SIMPLE_DEFAULT(0xFFFFFF), 0x00000032, 3, ZAP_TYPE(INT24U),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LampRatedHours */                                  \
-            { ZAP_SIMPLE_DEFAULT(0x000000), 0x00000033, 3, ZAP_TYPE(INT24U),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LampBurnHours */                                   \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(38), 0x00000034, 1, ZAP_TYPE(BITMAP8),                                                    \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LampAlarmMode */                                    \
-            { ZAP_SIMPLE_DEFAULT(0xFFFFFF), 0x00000035, 3, ZAP_TYPE(INT24U),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LampBurnHoursTripPoint */                          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Illuminance Measurement (server) */                                                           \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */     \
-            { ZAP_SIMPLE_DEFAULT(0x01), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* MinMeasuredValue */  \
-            { ZAP_SIMPLE_DEFAULT(0xFFFE), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },                                   /* Tolerance */         \
-            { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) },    /* LightSensorType */   \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Temperature Measurement (server) */                                                           \
-            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000000, 2, ZAP_TYPE(TEMPERATURE),                                                    \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                                                                  \
-            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000001, 2, ZAP_TYPE(TEMPERATURE),                                                    \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                                                               \
-            { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000002, 2, ZAP_TYPE(TEMPERATURE),                                                    \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) },                                /* MaxMeasuredValue */                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },     /* Tolerance */                                       \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Pressure Measurement (server) */                                                              \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* MinMeasuredValue */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* MaxMeasuredValue */  \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Flow Measurement (server) */                                                                  \
-            { ZAP_SIMPLE_DEFAULT(5), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* MeasuredValue */        \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* MinMeasuredValue */     \
-            { ZAP_SIMPLE_DEFAULT(100), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },                              /* Tolerance */            \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                            /* FeatureMap */           \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                              /* ClusterRevision */      \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* MeasuredValue */     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },      /* MinMeasuredValue */  \
-            { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },                                   /* Tolerance */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Occupancy Sensing (server) */                                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */                                          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },   /* OccupancySensorType */                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */                          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Carbon Monoxide Concentration Measurement (server) */                                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Uncertainty */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* MeasurementUnit */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MeasurementMedium */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LevelValue */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Carbon Dioxide Concentration Measurement (server) */                                          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Uncertainty */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* MeasurementUnit */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MeasurementMedium */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LevelValue */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Nitrogen Dioxide Concentration Measurement (server) */                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Uncertainty */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* MeasurementUnit */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MeasurementMedium */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LevelValue */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Ozone Concentration Measurement (server) */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Uncertainty */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* MeasurementUnit */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MeasurementMedium */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LevelValue */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: PM2.5 Concentration Measurement (server) */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Uncertainty */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* MeasurementUnit */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MeasurementMedium */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LevelValue */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Formaldehyde Concentration Measurement (server) */                                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Uncertainty */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* MeasurementUnit */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MeasurementMedium */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LevelValue */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: PM1 Concentration Measurement (server) */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Uncertainty */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* MeasurementUnit */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MeasurementMedium */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LevelValue */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: PM10 Concentration Measurement (server) */                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Uncertainty */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* MeasurementUnit */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MeasurementMedium */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LevelValue */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Total Volatile Organic Compounds Concentration Measurement (server) */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Uncertainty */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* MeasurementUnit */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MeasurementMedium */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LevelValue */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Radon Concentration Measurement (server) */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Uncertainty */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* MeasurementUnit */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MeasurementMedium */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LevelValue */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Wake on LAN (server) */                                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 13, ZAP_TYPE(CHAR_STRING), 0 }, /* MACAddress */                                    \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },   /* FeatureMap */                                    \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },     /* ClusterRevision */                               \
-                                                                                                                                   \
-            /* Endpoint: 1, Cluster: Low Power (server) */                                                                         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
+        /* Endpoint: 0, Cluster: Unit Localization (server) */                                                                     \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(0), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                           \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* TemperatureUnit */       \
+        { ZAP_SIMPLE_DEFAULT(0x1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                             /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Power Source Configuration (server) */                                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Sources */               \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Power Source (server) */                                                                          \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 },                                  /* Status */                \
+        { ZAP_SIMPLE_DEFAULT(3), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },                                  /* Order */                 \
+        { ZAP_LONG_DEFAULTS_INDEX(6), 0x00000002, 61, ZAP_TYPE(CHAR_STRING), 0 },                      /* Description */           \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000000E, 1, ZAP_TYPE(ENUM8), 0 },                                  /* BatChargeLevel */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000F, 1, ZAP_TYPE(BOOLEAN), 0 },                                  /* BatReplacementNeeded */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(ENUM8), 0 },                                    /* BatReplaceability */     \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001F, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EndpointList */          \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: General Commissioning (server) */                                                                 \
+        { ZAP_LONG_DEFAULTS_INDEX(9), 0x00000000, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Breadcrumb */            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BasicCommissioningInfo */                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RegulatoryConfig */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LocationCapability */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* SupportsConcurrentConnection */                        \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Network Commissioning (server) */                                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U), 0 },                                    /* MaxNetworks */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Networks */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), 0 },                                    /* ScanMaxTimeSeconds */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), 0 },                                    /* ConnectMaxTimeSeconds */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(WRITABLE) },       /* InterfaceEnabled */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) },         /* LastNetworkingStatus */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(OCTET_STRING), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkID */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32S), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* LastConnectErrorValue */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedWiFiBands */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 2, ZAP_TYPE(BITMAP16),                                                                  \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedThreadFeatures */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ThreadVersion */        \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */           \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */      \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Diagnostic Logs (server) */                                                                       \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: General Diagnostics (server) */                                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* NetworkInterfaces */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RebootCount */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* UpTime */               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                                                      /* TotalOperationalHours */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BootReason */            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveHardwareFaults */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveRadioFaults */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveNetworkFaults */   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TestEventTriggersEnabled */                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Software Diagnostics (server) */                                                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* ThreadMetrics */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapFree */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapUsed */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapHighWatermark */                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Channel */                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RoutingRole */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 17, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NetworkName */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PanId */                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ExtendedPanId */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 18, ZAP_TYPE(OCTET_STRING),                                                             \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* MeshLocalPrefix */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OverrunCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* NeighborTable */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* RouteTable */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PartitionId */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Weighting */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000B, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DataVersion */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000C, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StableDataVersion */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000D, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* LeaderRouterId */       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000E, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DetachedRoleCount */    \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000F, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ChildRoleCount */       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000010, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RouterRoleCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000011, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LeaderRoleCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000012, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AttachAttemptCount */   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000013, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PartitionIdChangeCount */                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000014, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BetterPartitionAttachAttemptCount */                                          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000015, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ParentChangeCount */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000016, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxTotalCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000017, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxUnicastCount */       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000018, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBroadcastCount */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000019, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxAckRequestedCount */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001A, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxAckedCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001B, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxNoAckRequestedCount */                                                      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001C, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDataCount */          \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001D, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDataPollCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001E, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBeaconCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001F, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBeaconRequestCount */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000020, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxOtherCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000021, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxRetryCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000022, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDirectMaxRetryExpiryCount */                                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000023, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxIndirectMaxRetryExpiryCount */                                              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000024, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrCcaCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000025, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrAbortCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000026, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrBusyChannelCount */                                                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000027, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxTotalCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000028, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxUnicastCount */       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000029, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBroadcastCount */     \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002A, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDataCount */          \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002B, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDataPollCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002C, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBeaconCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002D, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBeaconRequestCount */ \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002E, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxOtherCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002F, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxAddressFilteredCount */                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000030, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDestAddrFilteredCount */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000031, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDuplicatedCount */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000032, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrNoFrameCount */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000033, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrUnknownNeighborCount */                                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000034, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrInvalidSrcAddrCount */                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000035, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrSecCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000036, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrFcsCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000037, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrOtherCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000038, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActiveTimestamp */                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000039, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PendingTimestamp */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x0000003A, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Delay */                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000003B, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SecurityPolicy */                              \
+        { ZAP_EMPTY_DEFAULT(), 0x0000003C, 5, ZAP_TYPE(OCTET_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ChannelPage0Mask */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x0000003D, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OperationalDatasetComponents */                \
+        { ZAP_EMPTY_DEFAULT(), 0x0000003E, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                             /* ActiveNetworkFaultsList */                        \
+        { ZAP_SIMPLE_DEFAULT(0x000F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                     \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },        /* ClusterRevision */                                \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */                                                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 7, ZAP_TYPE(OCTET_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BSSID */                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SecurityType */                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* WiFiVersion */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ChannelNumber */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(INT8S),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RSSI */                                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BeaconLostCount */                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BeaconRxCount */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketMulticastRxCount */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketMulticastTxCount */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketUnicastRxCount */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketUnicastTxCount */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000B, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentMaxRate */                              \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000C, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OverrunCount */                                \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                             \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */                                                          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PHYRate */                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* FullDuplex */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PacketRxCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PacketTxCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrCount */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CollisionCount */       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OverrunCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* CarrierDetect */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TimeSinceReset */       \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */           \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */      \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Time Synchronization (server) */                                                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 8, ZAP_TYPE(EPOCH_US),                                                                  \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                       /* UTCTime */               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Granularity */           \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000002, 1, ZAP_TYPE(ENUM8), 0 },                               /* TimeSource */            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* TrustedTimeSource */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 129, ZAP_TYPE(CHAR_STRING),                                                             \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                       /* DefaultNTP */            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TimeZone */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DSTOffset */             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 8, ZAP_TYPE(EPOCH_US),                                                                  \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                       /* LocalTime */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 },                                  /* TimeZoneDatabase */      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TimeZoneListMaxSize */   \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000B, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DSTOffsetListMaxSize */  \
+        { ZAP_SIMPLE_DEFAULT(true), 0x0000000C, 1, ZAP_TYPE(BOOLEAN), 0 },                             /* SupportsDNSResolve */    \
+        { ZAP_SIMPLE_DEFAULT(0x0B), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                            /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Administrator Commissioning (server) */                                                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX),                                                                \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */                               \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                             \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Operational Credentials (server) */                                                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NOCs */                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Fabrics */               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedFabrics */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CommissionedFabrics */   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TrustedRootCertificates */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentFabricIndex */    \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Group Key Management (server) */                                                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                        /* GroupKeyMap */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* GroupTable */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupsPerFabric */   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupKeysPerFabric */                                                      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LabelList */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: User Label (server) */                                                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LabelList */                                   \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                             \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Relative Humidity Measurement (server) */                                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* MeasuredValue */         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },      /* MinMeasuredValue */      \
+        { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */      \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: Fault Injection (server) */                                                                       \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Identify (server) */                                                                              \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */          \
+        { ZAP_SIMPLE_DEFAULT(0x0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },                                /* IdentifyType */          \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Groups (server) */                                                                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 },    /* NameSupport */                                         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: On/Off (server) */                                                                                \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(TOKENIZE) },  /* OnOff */                 \
+        { ZAP_SIMPLE_DEFAULT(0x01), 0x00004000, 1, ZAP_TYPE(BOOLEAN), 0 },                             /* GlobalSceneControl */    \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnTime */                \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OffWaitTime */           \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(1), 0x00004003, 1, ZAP_TYPE(ENUM8),                                                           \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                              \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) },                                 /* StartUpOnOff */                                   \
+        { ZAP_SIMPLE_DEFAULT(0x0001), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                     \
+        { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },        /* ClusterRevision */                                \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Level Control (server) */                                                                         \
+        { ZAP_SIMPLE_DEFAULT(0xFE), 0x00000000, 1, ZAP_TYPE(INT8U),                                                                \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },    /* CurrentLevel */                                     \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000001, 2, ZAP_TYPE(INT16U), 0 }, /* RemainingTime */                                    \
+        { ZAP_SIMPLE_DEFAULT(0x01), 0x00000002, 1, ZAP_TYPE(INT8U), 0 },    /* MinLevel */                                         \
+        { ZAP_SIMPLE_DEFAULT(0xFE), 0x00000003, 1, ZAP_TYPE(INT8U), 0 },    /* MaxLevel */                                         \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000004, 2, ZAP_TYPE(INT16U), 0 }, /* CurrentFrequency */                                 \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000005, 2, ZAP_TYPE(INT16U), 0 }, /* MinFrequency */                                     \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000006, 2, ZAP_TYPE(INT16U), 0 }, /* MaxFrequency */                                     \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(2), 0x0000000F, 1, ZAP_TYPE(BITMAP8),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                                /* Options */               \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000010, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnOffTransitionTime */   \
+        { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000011, 1, ZAP_TYPE(INT8U),                                                                \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnLevel */                                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000012, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnTransitionTime */                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000013, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OffTransitionTime */                                   \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(3), 0x00000014, 1, ZAP_TYPE(INT8U),                                                           \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DefaultMoveRate */       \
+        { ZAP_SIMPLE_DEFAULT(255), 0x00004000, 1, ZAP_TYPE(INT8U),                                                                 \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpCurrentLevel */  \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */           \
+        { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */      \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Descriptor (server) */                                                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* DeviceTypeList */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* TagList */            \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Binding (server) */                                                                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Binding */                                     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                             \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Actions (server) */                                                                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActionList */            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EndpointLists */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 514, ZAP_TYPE(LONG_CHAR_STRING), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SetupURL */ \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */           \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */      \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Power Source (server) */                                                                          \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 },                                  /* Status */                \
+        { ZAP_SIMPLE_DEFAULT(2), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },                                  /* Order */                 \
+        { ZAP_LONG_DEFAULTS_INDEX(17), 0x00000002, 61, ZAP_TYPE(CHAR_STRING), 0 },                     /* Description */           \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000000E, 1, ZAP_TYPE(ENUM8), 0 },                                  /* BatChargeLevel */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000F, 1, ZAP_TYPE(BOOLEAN), 0 },                                  /* BatReplacementNeeded */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(ENUM8), 0 },                                    /* BatReplaceability */     \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001F, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EndpointList */          \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Switch (server) */                                                                                \
+        { ZAP_SIMPLE_DEFAULT(2), 0x00000000, 1, ZAP_TYPE(INT8U), 0 },    /* NumberOfPositions */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },      /* CurrentPosition */                                     \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Fixed Label (server) */                                                                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LabelList */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: User Label (server) */                                                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LabelList */                                   \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                             \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Boolean State (server) */                                                                         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(BOOLEAN), 0 },  /* StateValue */                                          \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Oven Cavity Operational State (server) */                                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PhaseList */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPhase */                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* CountdownTime */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* OperationalStateList */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* OperationalState */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalError */     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */           \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */      \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Oven Mode (server) */                                                                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },                                    /* CurrentMode */           \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Laundry Dryer Controls (server) */                                                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedDrynessLevels */                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SelectedDrynessLevel */                                \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Mode Select (server) */                                                                           \
+        { ZAP_LONG_DEFAULTS_INDEX(20), 0x00000000, 65, ZAP_TYPE(CHAR_STRING), 0 },                     /* Description */           \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(ENUM16), ZAP_ATTRIBUTE_MASK(NULLABLE) },      /* StandardNamespace */     \
+        { ZAP_SIMPLE_DEFAULT(255), 0xFFF10001, 1, ZAP_TYPE(INT8U), 0 },                                /* ManufacturerExtension */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */        \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },       /* CurrentMode */           \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000004, 1, ZAP_TYPE(INT8U),                                                                   \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */          \
+        { ZAP_SIMPLE_DEFAULT(255), 0x00000005, 1, ZAP_TYPE(INT8U),                                                                 \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */               \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */           \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */      \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Laundry Washer Mode (server) */                                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentMode */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },       /* FeatureMap */   \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Refrigerator And Temperature Controlled Cabinet Mode (server) */                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentMode */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },       /* FeatureMap */   \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Laundry Washer Controls (server) */                                                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SpinSpeeds */            \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(4), 0x00000001, 1, ZAP_TYPE(INT8U),                                                           \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SpinSpeedCurrent */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* NumberOfRinses */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedRinses */       \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: RVC Run Mode (server) */                                                                          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* SupportedModes */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* CurrentMode */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: RVC Clean Mode (server) */                                                                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* SupportedModes */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* CurrentMode */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Temperature Control (server) */                                                                   \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000004, 1, ZAP_TYPE(INT8U), 0 }, /* SelectedTemperatureLevel */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* SupportedTemperatureLevels */                          \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Refrigerator Alarm (server) */                                                                    \
+        { ZAP_SIMPLE_DEFAULT(1), 0x00000000, 4, ZAP_TYPE(BITMAP32), 0 }, /* Mask */                                                \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 4, ZAP_TYPE(BITMAP32), 0 }, /* State */                                               \
+        { ZAP_SIMPLE_DEFAULT(1), 0x00000003, 4, ZAP_TYPE(BITMAP32), 0 }, /* Supported */                                           \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Dishwasher Mode (server) */                                                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentMode */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpMode */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnMode */       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },       /* FeatureMap */   \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Air Quality (server) */                                                                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* AirQuality */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Smoke CO Alarm (server) */                                                                        \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* ExpressedState */            \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* SmokeState */                \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* COState */                   \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* BatteryAlert */              \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* DeviceMuted */               \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000005, 1, ZAP_TYPE(BOOLEAN), 0 },                            /* TestInProgress */            \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000006, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* HardwareFaultAlert */        \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000007, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* EndOfServiceAlert */         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 },                              /* InterconnectSmokeAlarm */    \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 1, ZAP_TYPE(ENUM8), 0 },                              /* InterconnectCOAlarm */       \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000000A, 1, ZAP_TYPE(ENUM8), 0 },                              /* ContaminationState */        \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(5), 0x0000000B, 1, ZAP_TYPE(ENUM8),                                                           \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* SmokeSensitivityLevel */                               \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000000C, 4, ZAP_TYPE(EPOCH_S), 0 },  /* ExpiryDate */                                          \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Dishwasher Alarm (server) */                                                                      \
+        { ZAP_SIMPLE_DEFAULT(1), 0x00000000, 4, ZAP_TYPE(BITMAP32), 0 },  /* Mask */                                               \
+        { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 4, ZAP_TYPE(BITMAP32), 0 },  /* Latch */                                              \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 4, ZAP_TYPE(BITMAP32), 0 },  /* State */                                              \
+        { ZAP_SIMPLE_DEFAULT(15), 0x00000003, 4, ZAP_TYPE(BITMAP32), 0 }, /* Supported */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },  /* FeatureMap */                                         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },    /* ClusterRevision */                                    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Microwave Oven Mode (server) */                                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* SupportedModes */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* CurrentMode */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Operational State (server) */                                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PhaseList */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPhase */                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* CountdownTime */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* OperationalStateList */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* OperationalState */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalError */     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */           \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */      \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: RVC Operational State (server) */                                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PhaseList */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPhase */                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* CountdownTime */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* OperationalStateList */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* OperationalState */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OperationalError */     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */           \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */      \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Scenes Management (server) */                                                                     \
+        { ZAP_LONG_DEFAULTS_INDEX(27), 0x00000000, 8, ZAP_TYPE(NODE_ID), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConfiguredBy */    \
+        { ZAP_SIMPLE_DEFAULT(16), 0x00000001, 2, ZAP_TYPE(INT16U), 0 },                                  /* SceneTableSize */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* FabricSceneInfo */     \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                 /* FeatureMap */          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                   /* ClusterRevision */     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: HEPA Filter Monitoring (server) */                                                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(PERCENT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Condition */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DegradationDirection */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ChangeIndication */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* InPlaceIndicator */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(EPOCH_S),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                    \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastChangedTime */                                                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ReplacementProductList */                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Activated Carbon Filter Monitoring (server) */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(PERCENT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Condition */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DegradationDirection */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ChangeIndication */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* InPlaceIndicator */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(EPOCH_S),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                    \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastChangedTime */                                                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ReplacementProductList */                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Boolean State Configuration (server) */                                                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                 /* CurrentSensitivityLevel */     \
+        { ZAP_SIMPLE_DEFAULT(3), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },                            /* SupportedSensitivityLevels */  \
+        { ZAP_SIMPLE_DEFAULT(2), 0x00000002, 1, ZAP_TYPE(INT8U), 0 },                            /* DefaultSensitivityLevel */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(BITMAP8), 0 },                            /* AlarmsActive */                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BITMAP8), 0 },                            /* AlarmsSuppressed */            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* AlarmsEnabled */               \
+        { ZAP_SIMPLE_DEFAULT(0x03), 0x00000006, 1, ZAP_TYPE(BITMAP8), 0 },                       /* AlarmsSupported */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000007, 2, ZAP_TYPE(BITMAP16), 0 },                         /* SensorFault */                 \
+        { ZAP_SIMPLE_DEFAULT(0x0F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                      /* FeatureMap */                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                           /* ClusterRevision */             \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Valve Configuration and Control (server) */                                                       \
+        { ZAP_SIMPLE_DEFAULT(0xFFFFFFFF), 0x00000000, 4, ZAP_TYPE(ELAPSED_S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OpenDuration */   \
+        { ZAP_SIMPLE_DEFAULT(0xFFFFFFFF), 0x00000001, 4, ZAP_TYPE(ELAPSED_S),                                                      \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DefaultOpenDuration */  \
+        { ZAP_LONG_DEFAULTS_INDEX(35), 0x00000002, 8, ZAP_TYPE(EPOCH_US), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AutoCloseTime */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                      /* RemainingDuration */      \
+        { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* CurrentState */           \
+        { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000005, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* TargetState */            \
+        { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000006, 1, ZAP_TYPE(PERCENT), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentLevel */           \
+        { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000007, 1, ZAP_TYPE(PERCENT), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* TargetLevel */            \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(6), 0x00000008, 1, ZAP_TYPE(PERCENT),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* DefaultOpenLevel */      \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000009, 2, ZAP_TYPE(BITMAP16), 0 },                               /* ValveFault */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000000A, 1, ZAP_TYPE(INT8U), 0 },                                  /* LevelStep */             \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Electrical Power Measurement (server) */                                                          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PowerMode */             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NumberOfMeasurementTypes */                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Accuracy */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Ranges */                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(VOLTAGE_MV),                                                                \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Voltage */                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 8, ZAP_TYPE(AMPERAGE_MA),                                                               \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActiveCurrent */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(AMPERAGE_MA),                                                               \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ReactiveCurrent */                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 8, ZAP_TYPE(AMPERAGE_MA),                                                               \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ApparentCurrent */                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 8, ZAP_TYPE(POWER_MW),                                                                  \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActivePower */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 8, ZAP_TYPE(POWER_MW),                                                                  \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ReactivePower */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 8, ZAP_TYPE(POWER_MW),                                                                  \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ApparentPower */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000B, 8, ZAP_TYPE(VOLTAGE_MV),                                                                \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RMSVoltage */                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000C, 8, ZAP_TYPE(AMPERAGE_MA),                                                               \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RMSCurrent */                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000D, 8, ZAP_TYPE(POWER_MW),                                                                  \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RMSPower */                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000E, 8, ZAP_TYPE(INT64S),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Frequency */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000F, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* HarmonicCurrents */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000010, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* HarmonicPhases */                              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000011, 8, ZAP_TYPE(INT64S),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PowerFactor */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000012, 8, ZAP_TYPE(AMPERAGE_MA),                                                               \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                          /* NeutralCurrent */     \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Electrical Energy Measurement (server) */                                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Accuracy */             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CumulativeEnergyImported */                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CumulativeEnergyExported */                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeriodicEnergyImported */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeriodicEnergyExported */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CumulativeEnergyReset */                       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Device Energy Management (server) */                                                              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ESAType */            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* ESACanGenerate */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ESAState */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 8, ZAP_TYPE(POWER_MW), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AbsMinPower */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(POWER_MW), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AbsMaxPower */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PowerAdjustmentCapability */                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                          /* Forecast */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* OptOutState */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Energy EVSE (server) */                                                                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                       /* State */                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupplyState */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FaultState */            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(EPOCH_S),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ChargingEnabledUntil */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 8, ZAP_TYPE(AMPERAGE_MA), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CircuitCapacity */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(AMPERAGE_MA),                                                               \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MinimumChargeCurrent */                                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 8, ZAP_TYPE(AMPERAGE_MA),                                                               \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaximumChargeCurrent */                                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 8, ZAP_TYPE(AMPERAGE_MA),                                                               \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* UserMaximumChargeCurrent */                    \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* RandomizationDelayWindow */                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000023, 4, ZAP_TYPE(EPOCH_S),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NextChargeStartTime */                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000024, 4, ZAP_TYPE(EPOCH_S),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NextChargeTargetTime */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000025, 8, ZAP_TYPE(ENERGY_MWH),                                                                \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NextChargeRequiredEnergy */                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000026, 1, ZAP_TYPE(PERCENT),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NextChargeTargetSoC */                         \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(7), 0x00000027, 2, ZAP_TYPE(INT16U),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                      \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ApproximateEVEfficiency */                                                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000040, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SessionID */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000041, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SessionDuration */                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000042, 8, ZAP_TYPE(ENERGY_MWH),                                                                \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SessionEnergyCharged */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Energy Preference (server) */                                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EnergyBalances */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* CurrentEnergyBalance */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EnergyPriorities */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LowPowerModeSensitivities */                                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) },                                /* CurrentLowPowerModeSensitivity */                      \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Power Topology (server) */                                                                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* AvailableEndpoints */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ActiveEndpoints */    \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Energy EVSE Mode (server) */                                                                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* SupportedModes */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* CurrentMode */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Device Energy Management Mode (server) */                                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* SupportedModes */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* CurrentMode */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Window Covering (server) */                                                                       \
+        { ZAP_SIMPLE_DEFAULT(0x08), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 },    /* Type */                                             \
+        { ZAP_SIMPLE_DEFAULT(0xFFFF), 0x00000001, 2, ZAP_TYPE(INT16U), 0 }, /* PhysicalClosedLimitLift */                          \
+        { ZAP_SIMPLE_DEFAULT(0xFFFF), 0x00000002, 2, ZAP_TYPE(INT16U), 0 }, /* PhysicalClosedLimitTilt */                          \
+        { ZAP_SIMPLE_DEFAULT(0x7FFF), 0x00000003, 2, ZAP_TYPE(INT16U),                                                             \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPositionLift */                                 \
+        { ZAP_SIMPLE_DEFAULT(0x7FFF), 0x00000004, 2, ZAP_TYPE(INT16U),                                                             \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPositionTilt */                                 \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000005, 2, ZAP_TYPE(INT16U),                                                             \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* NumberOfActuationsLift */                                                             \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000006, 2, ZAP_TYPE(INT16U),                                                             \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) },                                                             /* NumberOfActuationsTilt */ \
+        { ZAP_SIMPLE_DEFAULT(0x03), 0x00000007, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ConfigStatus */           \
+        { ZAP_SIMPLE_DEFAULT(50), 0x00000008, 1, ZAP_TYPE(PERCENT),                                                                \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPositionLiftPercentage */                       \
+        { ZAP_SIMPLE_DEFAULT(50), 0x00000009, 1, ZAP_TYPE(PERCENT),                                                                \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* CurrentPositionTiltPercentage */                     \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000A, 1, ZAP_TYPE(BITMAP8), 0 }, /* OperationalStatus */                                 \
+        { ZAP_SIMPLE_DEFAULT(5000), 0x0000000B, 2, ZAP_TYPE(PERCENT100THS),                                                        \
+          ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* TargetPositionLiftPercent100ths */                                                    \
+        { ZAP_SIMPLE_DEFAULT(5000), 0x0000000C, 2, ZAP_TYPE(PERCENT100THS),                                                        \
+          ZAP_ATTRIBUTE_MASK(NULLABLE) },                                /* TargetPositionTiltPercent100ths */                     \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000D, 1, ZAP_TYPE(ENUM8), 0 }, /* EndProductType */                                      \
+        { ZAP_SIMPLE_DEFAULT(5000), 0x0000000E, 2, ZAP_TYPE(PERCENT100THS),                                                        \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPositionLiftPercent100ths */                    \
+        { ZAP_SIMPLE_DEFAULT(5000), 0x0000000F, 2, ZAP_TYPE(PERCENT100THS),                                                        \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentPositionTiltPercent100ths */                    \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000010, 2, ZAP_TYPE(INT16U),                                                             \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* InstalledOpenLimitLift */                                                             \
+        { ZAP_SIMPLE_DEFAULT(0xFFFF), 0x00000011, 2, ZAP_TYPE(INT16U),                                                             \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* InstalledClosedLimitLift */                                                           \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000012, 2, ZAP_TYPE(INT16U),                                                             \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* InstalledOpenLimitTilt */                                                             \
+        { ZAP_SIMPLE_DEFAULT(0xFFFF), 0x00000013, 2, ZAP_TYPE(INT16U),                                                             \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* InstalledClosedLimitTilt */                                                           \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(8), 0x00000017, 1, ZAP_TYPE(BITMAP8),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Mode */                  \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x0000001A, 2, ZAP_TYPE(BITMAP16), 0 },                            /* SafetyStatus */          \
+        { ZAP_SIMPLE_DEFAULT(0x17), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                            /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */                                                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxPressure */                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxSpeed */                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxFlow */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinConstPressure */             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxConstPressure */             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinCompPressure */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxCompPressure */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinConstSpeed */                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxConstSpeed */                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinConstFlow */                 \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxConstFlow */                 \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000B, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinConstTemp */                 \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000C, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxConstTemp */                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000010, 2, ZAP_TYPE(BITMAP16), 0 },                          /* PumpStatus */                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000011, 1, ZAP_TYPE(ENUM8), 0 },                             /* EffectiveOperationMode */       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000012, 1, ZAP_TYPE(ENUM8), 0 },                             /* EffectiveControlMode */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000013, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Capacity */                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000014, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Speed */                        \
+        { ZAP_SIMPLE_DEFAULT(0x000000), 0x00000015, 3, ZAP_TYPE(INT24U),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* LifetimeRunningHours */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000016, 3, ZAP_TYPE(INT24U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Power */                        \
+        { ZAP_SIMPLE_DEFAULT(0x00000000), 0x00000017, 4, ZAP_TYPE(INT32U),                                                         \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LifetimeEnergyConsumed */                              \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(9), 0x00000020, 1, ZAP_TYPE(ENUM8),                                                           \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OperationMode */                                        \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(10), 0x00000021, 1, ZAP_TYPE(ENUM8),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },     /* ControlMode */                                      \
+        { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                       \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },      /* ClusterRevision */                                  \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Thermostat (server) */                                                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(TEMPERATURE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LocalTemperature */        \
+        { ZAP_SIMPLE_DEFAULT(0x02BC), 0x00000003, 2, ZAP_TYPE(TEMPERATURE), 0 },                     /* AbsMinHeatSetpointLimit */ \
+        { ZAP_SIMPLE_DEFAULT(0x0BB8), 0x00000004, 2, ZAP_TYPE(TEMPERATURE), 0 },                     /* AbsMaxHeatSetpointLimit */ \
+        { ZAP_SIMPLE_DEFAULT(0x0640), 0x00000005, 2, ZAP_TYPE(TEMPERATURE), 0 },                     /* AbsMinCoolSetpointLimit */ \
+        { ZAP_SIMPLE_DEFAULT(0x0C80), 0x00000006, 2, ZAP_TYPE(TEMPERATURE), 0 },                     /* AbsMaxCoolSetpointLimit */ \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(11), 0x00000011, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OccupiedCoolingSetpoint */                              \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(12), 0x00000012, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OccupiedHeatingSetpoint */                              \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(13), 0x00000015, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MinHeatSetpointLimit */                                 \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(14), 0x00000016, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MaxHeatSetpointLimit */                                 \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(15), 0x00000017, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MinCoolSetpointLimit */                                 \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(16), 0x00000018, 2, ZAP_TYPE(TEMPERATURE),                                                    \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MaxCoolSetpointLimit */                                 \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(17), 0x00000019, 1, ZAP_TYPE(INT8S),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MinSetpointDeadBand */                                  \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(18), 0x0000001B, 1, ZAP_TYPE(ENUM8),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ControlSequenceOfOperation */                           \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(19), 0x0000001C, 1, ZAP_TYPE(ENUM8),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                                /* SystemMode */            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000048, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PresetTypes */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000049, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ScheduleTypes */         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000004A, 1, ZAP_TYPE(INT8U), 0 },                                  /* NumberOfPresets */       \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000004B, 1, ZAP_TYPE(INT8U), 0 },                                  /* NumberOfSchedules */     \
+        { ZAP_SIMPLE_DEFAULT(0xFF), 0x0000004D, 1, ZAP_TYPE(INT8U),                                                                \
+          ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NumberOfScheduleTransitionPerDay */                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x0000004E, 17, ZAP_TYPE(OCTET_STRING), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActivePresetHandle */    \
+        { ZAP_EMPTY_DEFAULT(), 0x0000004F, 17, ZAP_TYPE(OCTET_STRING), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActiveScheduleHandle */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000050, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Presets */                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000051, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                 /* Schedules */                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000052, 4, ZAP_TYPE(EPOCH_S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SetpointHoldExpiryTimestamp */ \
+        { ZAP_SIMPLE_DEFAULT(0x0023), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                    /* FeatureMap */                  \
+        { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                           /* ClusterRevision */             \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Fan Control (server) */                                                                           \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(20), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* FanMode */                                             \
+        { ZAP_SIMPLE_DEFAULT(0x02), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 }, /* FanModeSequence */                                     \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(21), 0x00000002, 1, ZAP_TYPE(PERCENT),                                                        \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PercentSetting */        \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000003, 1, ZAP_TYPE(PERCENT), 0 },                             /* PercentCurrent */        \
+        { ZAP_SIMPLE_DEFAULT(100), 0x00000004, 1, ZAP_TYPE(INT8U), 0 },                                /* SpeedMax */              \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(22), 0x00000005, 1, ZAP_TYPE(INT8U),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SpeedSetting */          \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000006, 1, ZAP_TYPE(INT8U), 0 },                               /* SpeedCurrent */          \
+        { ZAP_SIMPLE_DEFAULT(0x03), 0x00000007, 1, ZAP_TYPE(BITMAP8), 0 },                             /* RockSupport */           \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000008, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* RockSetting */           \
+        { ZAP_SIMPLE_DEFAULT(0x03), 0x00000009, 1, ZAP_TYPE(BITMAP8), 0 },                             /* WindSupport */           \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000A, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* WindSetting */           \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000000B, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) },       /* AirflowDirection */      \
+        { ZAP_SIMPLE_DEFAULT(0x3F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                            /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */                                               \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(23), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* TemperatureDisplayMode */                               \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(24), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* KeypadLockout */                                        \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(25), 0x00000002, 1, ZAP_TYPE(ENUM8),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* ScheduleProgrammingVisibility */                       \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Color Control (server) */                                                                         \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* CurrentHue */            \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* CurrentSaturation */     \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000002, 2, ZAP_TYPE(INT16U), 0 },                            /* RemainingTime */         \
+        { ZAP_SIMPLE_DEFAULT(0x616B), 0x00000003, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentX */              \
+        { ZAP_SIMPLE_DEFAULT(0x607D), 0x00000004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentY */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), 0 },                                    /* DriftCompensation */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 255, ZAP_TYPE(CHAR_STRING), 0 },                            /* CompensationText */      \
+        { ZAP_SIMPLE_DEFAULT(0x00FA), 0x00000007, 2, ZAP_TYPE(INT16U),                                                             \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) },                                                             /* ColorTemperatureMireds */ \
+        { ZAP_SIMPLE_DEFAULT(0x01), 0x00000008, 1, ZAP_TYPE(ENUM8), 0 },                              /* ColorMode */              \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000F, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Options */                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* NumberOfPrimaries */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000011, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary1X */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000012, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary1Y */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000013, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary1Intensity */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000015, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary2X */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary2Y */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000017, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary2Intensity */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000019, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary3X */              \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001A, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary3Y */              \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001B, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary3Intensity */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000020, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary4X */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000021, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary4Y */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000022, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary4Intensity */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000024, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary5X */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000025, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary5Y */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000026, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary5Intensity */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000028, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary6X */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000029, 2, ZAP_TYPE(INT16U), 0 },                                  /* Primary6Y */              \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002A, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* Primary6Intensity */      \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(26), 0x00000030, 2, ZAP_TYPE(INT16U),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* WhitePointX */                                          \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(27), 0x00000031, 2, ZAP_TYPE(INT16U),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* WhitePointY */                                          \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(28), 0x00000032, 2, ZAP_TYPE(INT16U),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointRX */                                         \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(29), 0x00000033, 2, ZAP_TYPE(INT16U),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointRY */                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000034, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ColorPointRIntensity */                                \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(30), 0x00000036, 2, ZAP_TYPE(INT16U),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointGX */                                         \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(31), 0x00000037, 2, ZAP_TYPE(INT16U),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointGY */                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000038, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ColorPointGIntensity */                                \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(32), 0x0000003A, 2, ZAP_TYPE(INT16U),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointBX */                                         \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(33), 0x0000003B, 2, ZAP_TYPE(INT16U),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ColorPointBY */                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000003C, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                               /* ColorPointBIntensity */  \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* EnhancedCurrentHue */    \
+        { ZAP_SIMPLE_DEFAULT(0x01), 0x00004001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* EnhancedColorMode */     \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00004002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* ColorLoopActive */       \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* ColorLoopDirection */    \
+        { ZAP_SIMPLE_DEFAULT(0x0019), 0x00004004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorLoopTime */         \
+        { ZAP_SIMPLE_DEFAULT(0x2300), 0x00004005, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStartEnhancedHue */                        \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004006, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStoredEnhancedHue */                       \
+        { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000400A, 2, ZAP_TYPE(BITMAP16), 0 }, /* ColorCapabilities */                                \
+        { ZAP_SIMPLE_DEFAULT(0x009A), 0x0000400B, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMinMireds */                       \
+        { ZAP_SIMPLE_DEFAULT(0x01C6), 0x0000400C, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMaxMireds */                       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000400D, 2, ZAP_TYPE(INT16U), 0 },        /* CoupleColorTempToLevelMinMireds */                  \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(34), 0x00004010, 2, ZAP_TYPE(INT16U),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                              \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) },                               /* StartUpColorTemperatureMireds */                    \
+        { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                       \
+        { ZAP_SIMPLE_DEFAULT(7), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },      /* ClusterRevision */                                  \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Ballast Configuration (server) */                                                                 \
+        { ZAP_SIMPLE_DEFAULT(0x01), 0x00000000, 1, ZAP_TYPE(INT8U), 0 },   /* PhysicalMinLevel */                                  \
+        { ZAP_SIMPLE_DEFAULT(0xFE), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },   /* PhysicalMaxLevel */                                  \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* BallastStatus */                                     \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(35), 0x00000010, 1, ZAP_TYPE(INT8U),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MinLevel */                                             \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(36), 0x00000011, 1, ZAP_TYPE(INT8U),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* MaxLevel */                                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000014, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* IntrinsicBallastFactor */                              \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(37), 0x00000015, 1, ZAP_TYPE(INT8U),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                             \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) },                       /* BallastFactorAdjustment */                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000020, 1, ZAP_TYPE(INT8U), 0 }, /* LampQuantity */                                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000030, 17, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LampType */               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000031, 17, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LampManufacturer */       \
+        { ZAP_SIMPLE_DEFAULT(0xFFFFFF), 0x00000032, 3, ZAP_TYPE(INT24U),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LampRatedHours */                                      \
+        { ZAP_SIMPLE_DEFAULT(0x000000), 0x00000033, 3, ZAP_TYPE(INT24U),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LampBurnHours */                                       \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(38), 0x00000034, 1, ZAP_TYPE(BITMAP8),                                                        \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LampAlarmMode */                                        \
+        { ZAP_SIMPLE_DEFAULT(0xFFFFFF), 0x00000035, 3, ZAP_TYPE(INT24U),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LampBurnHoursTripPoint */                              \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Illuminance Measurement (server) */                                                               \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */         \
+        { ZAP_SIMPLE_DEFAULT(0x01), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* MinMeasuredValue */      \
+        { ZAP_SIMPLE_DEFAULT(0xFFFE), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },                                   /* Tolerance */             \
+        { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) },    /* LightSensorType */       \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Temperature Measurement (server) */                                                               \
+        { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000000, 2, ZAP_TYPE(TEMPERATURE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */    \
+        { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000001, 2, ZAP_TYPE(TEMPERATURE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */ \
+        { ZAP_SIMPLE_DEFAULT(0x8000), 0x00000002, 2, ZAP_TYPE(TEMPERATURE), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },                                        /* Tolerance */        \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                    /* FeatureMap */       \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                      /* ClusterRevision */  \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Pressure Measurement (server) */                                                                  \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* MinMeasuredValue */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* MaxMeasuredValue */      \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Flow Measurement (server) */                                                                      \
+        { ZAP_SIMPLE_DEFAULT(5), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* MeasuredValue */            \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* MinMeasuredValue */         \
+        { ZAP_SIMPLE_DEFAULT(100), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },                              /* Tolerance */                \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                            /* FeatureMap */               \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                              /* ClusterRevision */          \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */                                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* MeasuredValue */         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) },      /* MinMeasuredValue */      \
+        { ZAP_SIMPLE_DEFAULT(0x2710), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U), 0 },                                   /* Tolerance */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Occupancy Sensing (server) */                                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */                                              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },   /* OccupancySensorType */                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */                              \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Carbon Monoxide Concentration Measurement (server) */                                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* Uncertainty */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementUnit */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementMedium */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* LevelValue */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Carbon Dioxide Concentration Measurement (server) */                                              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* Uncertainty */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementUnit */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementMedium */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* LevelValue */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Nitrogen Dioxide Concentration Measurement (server) */                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* Uncertainty */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementUnit */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementMedium */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* LevelValue */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Ozone Concentration Measurement (server) */                                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* Uncertainty */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementUnit */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementMedium */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* LevelValue */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: PM2.5 Concentration Measurement (server) */                                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* Uncertainty */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementUnit */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementMedium */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* LevelValue */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Formaldehyde Concentration Measurement (server) */                                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* Uncertainty */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementUnit */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementMedium */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* LevelValue */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: PM1 Concentration Measurement (server) */                                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* Uncertainty */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementUnit */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementMedium */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* LevelValue */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: PM10 Concentration Measurement (server) */                                                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* Uncertainty */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementUnit */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementMedium */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* LevelValue */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Total Volatile Organic Compounds Concentration Measurement (server) */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* Uncertainty */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementUnit */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementMedium */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* LevelValue */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Radon Concentration Measurement (server) */                                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MeasuredValue */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MinMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* MaxMeasuredValue */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PeakMeasuredValue */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PeakMeasuredValueWindow */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(SINGLE),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AverageMeasuredValue */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(ELAPSED_S),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AverageMeasuredValueWindow */                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* Uncertainty */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementUnit */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* MeasurementMedium */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* LevelValue */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Wake on LAN (server) */                                                                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 13, ZAP_TYPE(CHAR_STRING), 0 }, /* MACAddress */                                        \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },   /* FeatureMap */                                        \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },     /* ClusterRevision */                                   \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Low Power (server) */                                                                             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
+                                                                                                                                   \
+        /* Endpoint: 1, Cluster: Unit Testing (server) */                                                                          \
+        { ZAP_SIMPLE_DEFAULT(false), 0x00000000, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(WRITABLE) },    /* boolean */            \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) },        /* bitmap8 */            \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 2, ZAP_TYPE(BITMAP16), ZAP_ATTRIBUTE_MASK(WRITABLE) },       /* bitmap16 */           \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(WRITABLE) },       /* bitmap32 */           \
+        { ZAP_LONG_DEFAULTS_INDEX(43), 0x00000004, 8, ZAP_TYPE(BITMAP64), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* bitmap64 */           \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000005, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(WRITABLE) },          /* int8u */              \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000006, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int16u */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000007, 3, ZAP_TYPE(INT24U), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int24u */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000008, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int32u */             \
+        { ZAP_LONG_DEFAULTS_INDEX(51), 0x00000009, 5, ZAP_TYPE(INT40U), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int40u */             \
+        { ZAP_LONG_DEFAULTS_INDEX(56), 0x0000000A, 6, ZAP_TYPE(INT48U), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int48u */             \
+        { ZAP_LONG_DEFAULTS_INDEX(62), 0x0000000B, 7, ZAP_TYPE(INT56U), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int56u */             \
+        { ZAP_LONG_DEFAULTS_INDEX(69), 0x0000000C, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int64u */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000000D, 1, ZAP_TYPE(INT8S), ZAP_ATTRIBUTE_MASK(WRITABLE) },          /* int8s */              \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000000E, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int16s */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000000F, 3, ZAP_TYPE(INT24S), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int24s */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000010, 4, ZAP_TYPE(INT32S), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int32s */             \
+        { ZAP_LONG_DEFAULTS_INDEX(77), 0x00000011, 5, ZAP_TYPE(INT40S), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int40s */             \
+        { ZAP_LONG_DEFAULTS_INDEX(82), 0x00000012, 6, ZAP_TYPE(INT48S), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int48s */             \
+        { ZAP_LONG_DEFAULTS_INDEX(88), 0x00000013, 7, ZAP_TYPE(INT56S), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int56s */             \
+        { ZAP_LONG_DEFAULTS_INDEX(95), 0x00000014, 8, ZAP_TYPE(INT64S), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int64s */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000015, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) },          /* enum8 */              \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000016, 2, ZAP_TYPE(ENUM16), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* enum16 */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000017, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* float_single */       \
+        { ZAP_LONG_DEFAULTS_INDEX(103), 0x00000018, 8, ZAP_TYPE(DOUBLE), ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* float_double */       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000019, 11, ZAP_TYPE(OCTET_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) },    /* octet_string */       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001A, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_int8u */                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001B, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_octet_string */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001C, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_struct_octet_string */                    \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001D, 1002, ZAP_TYPE(LONG_OCTET_STRING),                                                      \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) },                                                             /* long_octet_string */      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001E, 11, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* char_string */            \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001F, 1002, ZAP_TYPE(LONG_CHAR_STRING),                                                       \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) },                                                                  /* long_char_string */  \
+        { ZAP_LONG_DEFAULTS_INDEX(111), 0x00000020, 8, ZAP_TYPE(EPOCH_US), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* epoch_us */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000021, 4, ZAP_TYPE(EPOCH_S), ZAP_ATTRIBUTE_MASK(WRITABLE) },           /* epoch_s */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000022, 2, ZAP_TYPE(VENDOR_ID), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* vendor_id */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000023, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_nullables_and_optionals_struct */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000024, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* enum_attr */                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000025, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* struct_attr */                                 \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(39), 0x00000026, 1, ZAP_TYPE(INT8U),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int8u */                               \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(40), 0x00000027, 1, ZAP_TYPE(INT8S),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int8s */                               \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(41), 0x00000028, 2, ZAP_TYPE(INT16U),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int16u */                              \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(42), 0x00000029, 2, ZAP_TYPE(INT16S),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int16s */                              \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002A, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_long_octet_string */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002B, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_fabric_scoped */                          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000030, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(MUST_USE_TIMED_WRITE) }, /* timed_write_boolean */                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000031, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* general_error_boolean */                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000032, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* cluster_error_boolean */                       \
+        { ZAP_SIMPLE_DEFAULT(false), 0x00004000, 1, ZAP_TYPE(BOOLEAN),                                                             \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_boolean */                                    \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004001, 1, ZAP_TYPE(BITMAP8),                                                                 \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap8 */                                    \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004002, 2, ZAP_TYPE(BITMAP16),                                                                \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap16 */                                   \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004003, 4, ZAP_TYPE(BITMAP32),                                                                \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap32 */                                   \
+        { ZAP_LONG_DEFAULTS_INDEX(119), 0x00004004, 8, ZAP_TYPE(BITMAP64),                                                         \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap64 */                                   \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004005, 1, ZAP_TYPE(INT8U),                                                                   \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int8u */                                      \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004006, 2, ZAP_TYPE(INT16U),                                                                  \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int16u */                                     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004007, 3, ZAP_TYPE(INT24U),                                                                  \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int24u */                                     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004008, 4, ZAP_TYPE(INT32U),                                                                  \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int32u */                                     \
+        { ZAP_LONG_DEFAULTS_INDEX(127), 0x00004009, 5, ZAP_TYPE(INT40U),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int40u */                                     \
+        { ZAP_LONG_DEFAULTS_INDEX(132), 0x0000400A, 6, ZAP_TYPE(INT48U),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int48u */                                     \
+        { ZAP_LONG_DEFAULTS_INDEX(138), 0x0000400B, 7, ZAP_TYPE(INT56U),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int56u */                                     \
+        { ZAP_LONG_DEFAULTS_INDEX(145), 0x0000400C, 8, ZAP_TYPE(INT64U),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int64u */                                     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000400D, 1, ZAP_TYPE(INT8S),                                                                   \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int8s */                                      \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000400E, 2, ZAP_TYPE(INT16S),                                                                  \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int16s */                                     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000400F, 3, ZAP_TYPE(INT24S),                                                                  \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int24s */                                     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004010, 4, ZAP_TYPE(INT32S),                                                                  \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int32s */                                     \
+        { ZAP_LONG_DEFAULTS_INDEX(153), 0x00004011, 5, ZAP_TYPE(INT40S),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int40s */                                     \
+        { ZAP_LONG_DEFAULTS_INDEX(158), 0x00004012, 6, ZAP_TYPE(INT48S),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int48s */                                     \
+        { ZAP_LONG_DEFAULTS_INDEX(164), 0x00004013, 7, ZAP_TYPE(INT56S),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int56s */                                     \
+        { ZAP_LONG_DEFAULTS_INDEX(171), 0x00004014, 8, ZAP_TYPE(INT64S),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int64s */                                     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004015, 1, ZAP_TYPE(ENUM8),                                                                   \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_enum8 */                                      \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004016, 2, ZAP_TYPE(ENUM16),                                                                  \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_enum16 */                                     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004017, 4, ZAP_TYPE(SINGLE),                                                                  \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_float_single */                               \
+        { ZAP_LONG_DEFAULTS_INDEX(179), 0x00004018, 8, ZAP_TYPE(DOUBLE),                                                           \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_float_double */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00004019, 11, ZAP_TYPE(OCTET_STRING),                                                             \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_octet_string */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x0000401E, 11, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_char_string */                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00004024, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_enum_attr */                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00004025, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                    \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_struct */                                                                \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(43), 0x00004026, 1, ZAP_TYPE(INT8U),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                             \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int8u */                                                \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(44), 0x00004027, 1, ZAP_TYPE(INT8S),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                             \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int8s */                                                \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(45), 0x00004028, 2, ZAP_TYPE(INT16U),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                             \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int16u */                                               \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(46), 0x00004029, 2, ZAP_TYPE(INT16S),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                             \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int16s */                                               \
+        { ZAP_EMPTY_DEFAULT(), 0x0000402A, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                 /* write_only_int8u */            \
+        { ZAP_SIMPLE_DEFAULT(0), 0xFFF24F01, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* mei_int8u */                   \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                         /* FeatureMap */                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                           /* ClusterRevision */             \
+                                                                                                                                   \
+        /* Endpoint: 2, Cluster: Identify (server) */                                                                              \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */          \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },                               /* IdentifyType */          \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 2, Cluster: Groups (server) */                                                                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 },    /* NameSupport */                                         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Unit Testing (server) */                                                                      \
-            { ZAP_SIMPLE_DEFAULT(false), 0x00000000, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(WRITABLE) },    /* boolean */        \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) },        /* bitmap8 */        \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 2, ZAP_TYPE(BITMAP16), ZAP_ATTRIBUTE_MASK(WRITABLE) },       /* bitmap16 */       \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(WRITABLE) },       /* bitmap32 */       \
-            { ZAP_LONG_DEFAULTS_INDEX(43), 0x00000004, 8, ZAP_TYPE(BITMAP64), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* bitmap64 */       \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000005, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(WRITABLE) },          /* int8u */          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000006, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int16u */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000007, 3, ZAP_TYPE(INT24U), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int24u */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000008, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int32u */         \
-            { ZAP_LONG_DEFAULTS_INDEX(51), 0x00000009, 5, ZAP_TYPE(INT40U), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int40u */         \
-            { ZAP_LONG_DEFAULTS_INDEX(56), 0x0000000A, 6, ZAP_TYPE(INT48U), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int48u */         \
-            { ZAP_LONG_DEFAULTS_INDEX(62), 0x0000000B, 7, ZAP_TYPE(INT56U), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int56u */         \
-            { ZAP_LONG_DEFAULTS_INDEX(69), 0x0000000C, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int64u */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000000D, 1, ZAP_TYPE(INT8S), ZAP_ATTRIBUTE_MASK(WRITABLE) },          /* int8s */          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000000E, 2, ZAP_TYPE(INT16S), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int16s */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000000F, 3, ZAP_TYPE(INT24S), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int24s */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000010, 4, ZAP_TYPE(INT32S), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* int32s */         \
-            { ZAP_LONG_DEFAULTS_INDEX(77), 0x00000011, 5, ZAP_TYPE(INT40S), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int40s */         \
-            { ZAP_LONG_DEFAULTS_INDEX(82), 0x00000012, 6, ZAP_TYPE(INT48S), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int48s */         \
-            { ZAP_LONG_DEFAULTS_INDEX(88), 0x00000013, 7, ZAP_TYPE(INT56S), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int56s */         \
-            { ZAP_LONG_DEFAULTS_INDEX(95), 0x00000014, 8, ZAP_TYPE(INT64S), ZAP_ATTRIBUTE_MASK(WRITABLE) },   /* int64s */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000015, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) },          /* enum8 */          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000016, 2, ZAP_TYPE(ENUM16), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* enum16 */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000017, 4, ZAP_TYPE(SINGLE), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* float_single */   \
-            { ZAP_LONG_DEFAULTS_INDEX(103), 0x00000018, 8, ZAP_TYPE(DOUBLE), ZAP_ATTRIBUTE_MASK(WRITABLE) },  /* float_double */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000019, 11, ZAP_TYPE(OCTET_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) },    /* octet_string */   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001A, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_int8u */                              \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001B, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_octet_string */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001C, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_struct_octet_string */                \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001D, 1002, ZAP_TYPE(LONG_OCTET_STRING),                                                  \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) },                                                             /* long_octet_string */  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001E, 11, ZAP_TYPE(CHAR_STRING), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* char_string */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001F, 1002, ZAP_TYPE(LONG_CHAR_STRING),                                                   \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* long_char_string */                                                               \
-            { ZAP_LONG_DEFAULTS_INDEX(111), 0x00000020, 8, ZAP_TYPE(EPOCH_US), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* epoch_us */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000021, 4, ZAP_TYPE(EPOCH_S), ZAP_ATTRIBUTE_MASK(WRITABLE) },           /* epoch_s */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000022, 2, ZAP_TYPE(VENDOR_ID), ZAP_ATTRIBUTE_MASK(WRITABLE) },         /* vendor_id */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000023, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_nullables_and_optionals_struct */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000024, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* enum_attr */                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000025, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* struct_attr */                             \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(39), 0x00000026, 1, ZAP_TYPE(INT8U),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int8u */                           \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(40), 0x00000027, 1, ZAP_TYPE(INT8S),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int8s */                           \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(41), 0x00000028, 2, ZAP_TYPE(INT16U),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int16u */                          \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(42), 0x00000029, 2, ZAP_TYPE(INT16S),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* range_restricted_int16s */                          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002A, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_long_octet_string */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002B, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* list_fabric_scoped */                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000030, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(MUST_USE_TIMED_WRITE) }, /* timed_write_boolean */                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000031, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* general_error_boolean */                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000032, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* cluster_error_boolean */                   \
-            { ZAP_SIMPLE_DEFAULT(false), 0x00004000, 1, ZAP_TYPE(BOOLEAN),                                                         \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_boolean */                                \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004001, 1, ZAP_TYPE(BITMAP8),                                                             \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap8 */                                \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004002, 2, ZAP_TYPE(BITMAP16),                                                            \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap16 */                               \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004003, 4, ZAP_TYPE(BITMAP32),                                                            \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap32 */                               \
-            { ZAP_LONG_DEFAULTS_INDEX(119), 0x00004004, 8, ZAP_TYPE(BITMAP64),                                                     \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_bitmap64 */                               \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004005, 1, ZAP_TYPE(INT8U),                                                               \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int8u */                                  \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004006, 2, ZAP_TYPE(INT16U),                                                              \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int16u */                                 \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004007, 3, ZAP_TYPE(INT24U),                                                              \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int24u */                                 \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004008, 4, ZAP_TYPE(INT32U),                                                              \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int32u */                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(127), 0x00004009, 5, ZAP_TYPE(INT40U),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int40u */                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(132), 0x0000400A, 6, ZAP_TYPE(INT48U),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int48u */                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(138), 0x0000400B, 7, ZAP_TYPE(INT56U),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int56u */                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(145), 0x0000400C, 8, ZAP_TYPE(INT64U),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int64u */                                 \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000400D, 1, ZAP_TYPE(INT8S),                                                               \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int8s */                                  \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000400E, 2, ZAP_TYPE(INT16S),                                                              \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int16s */                                 \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000400F, 3, ZAP_TYPE(INT24S),                                                              \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int24s */                                 \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004010, 4, ZAP_TYPE(INT32S),                                                              \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int32s */                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(153), 0x00004011, 5, ZAP_TYPE(INT40S),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int40s */                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(158), 0x00004012, 6, ZAP_TYPE(INT48S),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int48s */                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(164), 0x00004013, 7, ZAP_TYPE(INT56S),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int56s */                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(171), 0x00004014, 8, ZAP_TYPE(INT64S),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_int64s */                                 \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004015, 1, ZAP_TYPE(ENUM8),                                                               \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_enum8 */                                  \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004016, 2, ZAP_TYPE(ENUM16),                                                              \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_enum16 */                                 \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004017, 4, ZAP_TYPE(SINGLE),                                                              \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_float_single */                           \
-            { ZAP_LONG_DEFAULTS_INDEX(179), 0x00004018, 8, ZAP_TYPE(DOUBLE),                                                       \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_float_double */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00004019, 11, ZAP_TYPE(OCTET_STRING),                                                         \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_octet_string */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x0000401E, 11, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_char_string */                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00004024, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_enum_attr */                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00004025, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_struct */                                                            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(43), 0x00004026, 1, ZAP_TYPE(INT8U),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                         \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int8u */                                            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(44), 0x00004027, 1, ZAP_TYPE(INT8S),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                         \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int8s */                                            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(45), 0x00004028, 2, ZAP_TYPE(INT16U),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                         \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int16u */                                           \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(46), 0x00004029, 2, ZAP_TYPE(INT16S),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                         \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* nullable_range_restricted_int16s */                                           \
-            { ZAP_EMPTY_DEFAULT(), 0x0000402A, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                 /* write_only_int8u */        \
-            { ZAP_SIMPLE_DEFAULT(0), 0xFFF24F01, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* mei_int8u */               \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                         /* FeatureMap */              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                           /* ClusterRevision */         \
-                                                                                                                                   \
-            /* Endpoint: 2, Cluster: Identify (server) */                                                                          \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */      \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },                               /* IdentifyType */      \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 2, Cluster: Groups (server) */                                                                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 },    /* NameSupport */                                     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
-                                                                                                                                   \
-            /* Endpoint: 2, Cluster: On/Off (server) */                                                                            \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(BOOLEAN), 0 },                        /* OnOff */                  \
-            { ZAP_SIMPLE_DEFAULT(1), 0x00004000, 1, ZAP_TYPE(BOOLEAN), 0 },                           /* GlobalSceneControl */     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnTime */                 \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00004002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OffWaitTime */            \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(47), 0x00004003, 1, ZAP_TYPE(ENUM8),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpOnOff */      \
-            { ZAP_SIMPLE_DEFAULT(0x0001), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                          /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 2, Cluster: Descriptor (server) */                                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* DeviceTypeList */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* TagList */        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 2, Cluster: Power Source (server) */                                                                      \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 },               /* Status */                               \
-            { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },               /* Order */                                \
-            { ZAP_LONG_DEFAULTS_INDEX(187), 0x00000002, 61, ZAP_TYPE(CHAR_STRING), 0 }, /* Description */                          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000000E, 1, ZAP_TYPE(ENUM8), 0 },               /* BatChargeLevel */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000F, 1, ZAP_TYPE(BOOLEAN), 0 },               /* BatReplacementNeeded */                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(ENUM8), 0 },                 /* BatReplaceability */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001F, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EndpointList */      \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 2, Cluster: Scenes Management (server) */                                                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(190), 0x00000000, 8, ZAP_TYPE(NODE_ID),                                                      \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) },                                                              /* LastConfiguredBy */  \
-            { ZAP_SIMPLE_DEFAULT(16), 0x00000001, 2, ZAP_TYPE(INT16U), 0 },                                /* SceneTableSize */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FabricSceneInfo */   \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
-                                                                                                                                   \
-            /* Endpoint: 2, Cluster: Occupancy Sensing (server) */                                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */                                          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },   /* OccupancySensorType */                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */                          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
-                                                                                                                                   \
-            /* Endpoint: 65534, Cluster: Descriptor (server) */                                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* DeviceTypeList */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
-                                                                                                                                   \
-            /* Endpoint: 65534, Cluster: Network Commissioning (server) */                                                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxNetworks */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Networks */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ScanMaxTimeSeconds */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ConnectMaxTimeSeconds */                                                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* InterfaceEnabled */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkingStatus */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(OCTET_STRING),                                                         \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkID */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32S),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConnectErrorValue */                   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
+        /* Endpoint: 2, Cluster: On/Off (server) */                                                                                \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(BOOLEAN), 0 },                        /* OnOff */                      \
+        { ZAP_SIMPLE_DEFAULT(1), 0x00004000, 1, ZAP_TYPE(BOOLEAN), 0 },                           /* GlobalSceneControl */         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnTime */                     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00004002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OffWaitTime */                \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(47), 0x00004003, 1, ZAP_TYPE(ENUM8),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpOnOff */          \
+        { ZAP_SIMPLE_DEFAULT(0x0001), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                          /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 2, Cluster: Descriptor (server) */                                                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* DeviceTypeList */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* TagList */            \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 2, Cluster: Power Source (server) */                                                                          \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8), 0 },                                  /* Status */                \
+        { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },                                  /* Order */                 \
+        { ZAP_LONG_DEFAULTS_INDEX(187), 0x00000002, 61, ZAP_TYPE(CHAR_STRING), 0 },                    /* Description */           \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000000E, 1, ZAP_TYPE(ENUM8), 0 },                                  /* BatChargeLevel */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000F, 1, ZAP_TYPE(BOOLEAN), 0 },                                  /* BatReplacementNeeded */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(ENUM8), 0 },                                    /* BatReplaceability */     \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001F, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* EndpointList */          \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
+                                                                                                                                   \
+        /* Endpoint: 2, Cluster: Scenes Management (server) */                                                                     \
+        { ZAP_LONG_DEFAULTS_INDEX(190), 0x00000000, 8, ZAP_TYPE(NODE_ID), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConfiguredBy */   \
+        { ZAP_SIMPLE_DEFAULT(16), 0x00000001, 2, ZAP_TYPE(INT16U), 0 },                                   /* SceneTableSize */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* FabricSceneInfo */    \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                  /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 2, Cluster: Occupancy Sensing (server) */                                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */                                              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },   /* OccupancySensorType */                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */                              \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 65534, Cluster: Descriptor (server) */                                                                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* DeviceTypeList */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */          \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* ClusterRevision */    \
+                                                                                                                                   \
+        /* Endpoint: 65534, Cluster: Network Commissioning (server) */                                                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxNetworks */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Networks */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ScanMaxTimeSeconds */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ConnectMaxTimeSeconds */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* InterfaceEnabled */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkingStatus */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(OCTET_STRING),                                                             \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkID */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32S),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConnectErrorValue */                       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* ClusterRevision */    \
     }
 
 // clang-format off
@@ -4074,8 +4365,10 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 28, 340 }, { ZAP_CLUSTER_INDEX(28), 70, 3457 }, { ZAP_CLUSTER_INDEX(98), 7, 122 },                 \
-            { ZAP_CLUSTER_INDEX(105), 2, 0 },                                                                                      \
+        { ZAP_CLUSTER_INDEX(0), 28, 340 },                                                                                         \
+        { ZAP_CLUSTER_INDEX(28), 70, 3457 },                                                                                       \
+        { ZAP_CLUSTER_INDEX(98), 7, 122 },                                                                                         \
+        { ZAP_CLUSTER_INDEX(105), 2, 0 },                                                                                          \
     }
 
 // Largest attribute size is needed for various buffers
@@ -4094,16 +4387,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
-#define FIXED_ENDPOINT_ARRAY                                                                                                       \
-    {                                                                                                                              \
-        0x0000, 0x0001, 0x0002, 0xFFFE                                                                                             \
-    }
+#define FIXED_ENDPOINT_ARRAY { 0x0000, 0x0001, 0x0002, 0xFFFE }
 
 // Array of profile ids
-#define FIXED_PROFILE_IDS                                                                                                          \
-    {                                                                                                                              \
-        0x0103, 0x0103, 0x0103, 0x0103                                                                                             \
-    }
+#define FIXED_PROFILE_IDS { 0x0103, 0x0103, 0x0103, 0x0103 }
 
 // Array of device types
 #define FIXED_DEVICE_TYPES                                                                                                         \
@@ -4115,25 +4402,13 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
     }
 
 // Array of device type offsets
-#define FIXED_DEVICE_TYPE_OFFSETS                                                                                                  \
-    {                                                                                                                              \
-        0, 2, 4, 6                                                                                                                 \
-    }
+#define FIXED_DEVICE_TYPE_OFFSETS { 0, 2, 4, 6 }
 
 // Array of device type lengths
-#define FIXED_DEVICE_TYPE_LENGTHS                                                                                                  \
-    {                                                                                                                              \
-        2, 2, 2, 1                                                                                                                 \
-    }
+#define FIXED_DEVICE_TYPE_LENGTHS { 2, 2, 2, 1 }
 
 // Array of endpoint types supported on each endpoint
-#define FIXED_ENDPOINT_TYPES                                                                                                       \
-    {                                                                                                                              \
-        0, 1, 2, 3                                                                                                                 \
-    }
+#define FIXED_ENDPOINT_TYPES { 0, 1, 2, 3 }
 
 // Array of parent endpoints for each endpoint
-#define FIXED_PARENT_ENDPOINTS                                                                                                     \
-    {                                                                                                                              \
-        kInvalidEndpointId, kInvalidEndpointId, kInvalidEndpointId, kInvalidEndpointId                                             \
-    }
+#define FIXED_PARENT_ENDPOINTS { kInvalidEndpointId, kInvalidEndpointId, kInvalidEndpointId, kInvalidEndpointId }
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
index 8695ffc341d879..fa214e1686690b 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
@@ -33,17 +33,37 @@
         /* Endpoint: 0, Cluster: Localization Configuration (server), big-endian */                                                \
                                                                                                                                    \
         /* 0 - ActiveLocale, */                                                                                                    \
-        5, 'e', 'n', '-', 'U', 'S',                                                                                                \
+        5,                                                                                                                         \
+        'e',                                                                                                                       \
+        'n',                                                                                                                       \
+        '-',                                                                                                                       \
+        'U',                                                                                                                       \
+        'S',                                                                                                                       \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: General Commissioning (server), big-endian */                                                 \
+        /* Endpoint: 0, Cluster: General Commissioning (server), big-endian */                                                     \
                                                                                                                                    \
-            /* 6 - Breadcrumb, */                                                                                                  \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+        /* 6 - Breadcrumb, */                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Scenes Management (server), big-endian */                                                     \
+        /* Endpoint: 1, Cluster: Scenes Management (server), big-endian */                                                         \
+                                                                                                                                   \
+        /* 14 - LastConfiguredBy, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
                                                                                                                                    \
-            /* 14 - LastConfiguredBy, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
     }
 
 #else // !CHIP_CONFIG_BIG_ENDIAN_TARGET
@@ -53,17 +73,37 @@
         /* Endpoint: 0, Cluster: Localization Configuration (server), little-endian */                                             \
                                                                                                                                    \
         /* 0 - ActiveLocale, */                                                                                                    \
-        5, 'e', 'n', '-', 'U', 'S',                                                                                                \
+        5,                                                                                                                         \
+        'e',                                                                                                                       \
+        'n',                                                                                                                       \
+        '-',                                                                                                                       \
+        'U',                                                                                                                       \
+        'S',                                                                                                                       \
+                                                                                                                                   \
+        /* Endpoint: 0, Cluster: General Commissioning (server), little-endian */                                                  \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: General Commissioning (server), little-endian */                                              \
+        /* 6 - Breadcrumb, */                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
                                                                                                                                    \
-            /* 6 - Breadcrumb, */                                                                                                  \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
+        /* Endpoint: 1, Cluster: Scenes Management (server), little-endian */                                                      \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Scenes Management (server), little-endian */                                                  \
+        /* 14 - LastConfiguredBy, */                                                                                               \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
+        0x00,                                                                                                                      \
                                                                                                                                    \
-            /* 14 - LastConfiguredBy, */                                                                                           \
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                                                        \
     }
 
 #endif // CHIP_CONFIG_BIG_ENDIAN_TARGET
@@ -94,453 +134,433 @@
     {                                                                                                                              \
                                                                                                                                    \
         /* Endpoint: 0, Cluster: Descriptor (server) */                                                                            \
-        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },        /* DeviceTypeList */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* DeviceTypeList */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */          \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* ClusterRevision */    \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Access Control (server) */                                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ACL */                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Extension */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SubjectsPerAccessControlEntry */                                          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TargetsPerAccessControlEntry */                                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* AccessControlEntriesPerFabric */                   \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
+        /* Endpoint: 0, Cluster: Access Control (server) */                                                                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ACL */                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Extension */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SubjectsPerAccessControlEntry */                                              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TargetsPerAccessControlEntry */                                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* AccessControlEntriesPerFabric */                       \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */      \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Basic Information (server) */                                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* DataModelRevision */                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorName */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorID */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductName */                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductID */                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* NodeLabel */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 3, ZAP_TYPE(CHAR_STRING),                                                           \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) |                                               \
-                  ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Location */                                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersion */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 65, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersionString */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersion */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 65, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersionString */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 17, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ManufacturingDate */                      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* PartNumber */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000D, 258, ZAP_TYPE(LONG_CHAR_STRING),                                                    \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductURL */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000E, 65, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductLabel */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000F, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SerialNumber */                           \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000010, 1, ZAP_TYPE(BOOLEAN),                                                             \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) |                                                       \
-                  ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LocalConfigDisabled */                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000012, 33, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) },                       /* UniqueID */         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000013, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CapabilityMinima */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000015, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SpecificationVersion */                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) },                  /* MaxPathsPerInvoke */     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                           /* FeatureMap */            \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ClusterRevision */       \
+        /* Endpoint: 0, Cluster: Basic Information (server) */                                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* DataModelRevision */                          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorName */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* VendorID */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductName */                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductID */                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* NodeLabel */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 3, ZAP_TYPE(CHAR_STRING),                                                               \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Location */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersion */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 65, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* HardwareVersionString */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersion */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 65, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SoftwareVersionString */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000B, 17, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ManufacturingDate */                          \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000C, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* PartNumber */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000D, 258, ZAP_TYPE(LONG_CHAR_STRING),                                                        \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductURL */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000E, 65, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ProductLabel */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000F, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SerialNumber */                               \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000010, 1, ZAP_TYPE(BOOLEAN),                                                                 \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(SINGLETON) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LocalConfigDisabled */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000012, 33, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) },                       /* UniqueID */             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000013, 0, ZAP_TYPE(STRUCT), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CapabilityMinima */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000015, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* SpecificationVersion */                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000016, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(SINGLETON) },                  /* MaxPathsPerInvoke */         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                           /* FeatureMap */                \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(SINGLETON) }, /* ClusterRevision */           \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                 /* DefaultOTAProviders */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 1, ZAP_TYPE(BOOLEAN), 0 },                          /* UpdatePossible */          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 1, ZAP_TYPE(ENUM8), 0 },                            /* UpdateState */             \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* UpdateStateProgress */     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                         /* FeatureMap */              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                           /* ClusterRevision */         \
+        /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */                                                         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                 /* DefaultOTAProviders */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x00000001, 1, ZAP_TYPE(BOOLEAN), 0 },                          /* UpdatePossible */              \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000002, 1, ZAP_TYPE(ENUM8), 0 },                            /* UpdateState */                 \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* UpdateStateProgress */         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                         /* FeatureMap */                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                           /* ClusterRevision */             \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Localization Configuration (server) */                                                        \
-            { ZAP_LONG_DEFAULTS_INDEX(0), 0x00000000, 36, ZAP_TYPE(CHAR_STRING),                                                   \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                               /* ActiveLocale */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedLocales */  \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
+        /* Endpoint: 0, Cluster: Localization Configuration (server) */                                                            \
+        { ZAP_LONG_DEFAULTS_INDEX(0), 0x00000000, 36, ZAP_TYPE(CHAR_STRING),                                                       \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                               /* ActiveLocale */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedLocales */      \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Time Format Localization (server) */                                                          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                               \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* HourFormat */                                      \
-            { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                               \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ActiveCalendarType */                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* SupportedCalendarTypes */                          \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
+        /* Endpoint: 0, Cluster: Time Format Localization (server) */                                                              \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                                   \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* HourFormat */                                          \
+        { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                   \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* ActiveCalendarType */                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* SupportedCalendarTypes */                              \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: General Commissioning (server) */                                                             \
-            { ZAP_LONG_DEFAULTS_INDEX(6), 0x00000000, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Breadcrumb */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BasicCommissioningInfo */                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RegulatoryConfig */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LocationCapability */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* SupportsConcurrentConnection */                    \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
+        /* Endpoint: 0, Cluster: General Commissioning (server) */                                                                 \
+        { ZAP_LONG_DEFAULTS_INDEX(6), 0x00000000, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Breadcrumb */            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BasicCommissioningInfo */                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RegulatoryConfig */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LocationCapability */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* SupportsConcurrentConnection */                        \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Network Commissioning (server) */                                                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U), 0 },                                    /* MaxNetworks */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Networks */          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), 0 },                              /* ScanMaxTimeSeconds */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), 0 },                              /* ConnectMaxTimeSeconds */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* InterfaceEnabled */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) },   /* LastNetworkingStatus */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(OCTET_STRING), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkID */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32S), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConnectErrorValue */    \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                        /* FeatureMap */               \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                          /* ClusterRevision */          \
+        /* Endpoint: 0, Cluster: Network Commissioning (server) */                                                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(INT8U), 0 },                                    /* MaxNetworks */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Networks */              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), 0 },                                    /* ScanMaxTimeSeconds */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), 0 },                                    /* ConnectMaxTimeSeconds */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(WRITABLE) },       /* InterfaceEnabled */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(NULLABLE) },         /* LastNetworkingStatus */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 33, ZAP_TYPE(OCTET_STRING), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastNetworkID */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32S), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* LastConnectErrorValue */ \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Diagnostic Logs (server) */                                                                   \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
+        /* Endpoint: 0, Cluster: Diagnostic Logs (server) */                                                                       \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: General Diagnostics (server) */                                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NetworkInterfaces */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RebootCount */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* UpTime */           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TotalOperationalHours */                                                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BootReason */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveHardwareFaults */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveRadioFaults */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveNetworkFaults */                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TestEventTriggersEnabled */                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
+        /* Endpoint: 0, Cluster: General Diagnostics (server) */                                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* NetworkInterfaces */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RebootCount */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* UpTime */               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                                                      /* TotalOperationalHours */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BootReason */            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveHardwareFaults */  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveRadioFaults */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ActiveNetworkFaults */   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TestEventTriggersEnabled */                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* ClusterRevision */    \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Software Diagnostics (server) */                                                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* ThreadMetrics */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapFree */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapUsed */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapHighWatermark */                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
+        /* Endpoint: 0, Cluster: Software Diagnostics (server) */                                                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* ThreadMetrics */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapFree */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapUsed */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentHeapHighWatermark */                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Channel */                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RoutingRole */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 17, ZAP_TYPE(CHAR_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NetworkName */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PanId */                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ExtendedPanId */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 18, ZAP_TYPE(OCTET_STRING),                                                         \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* MeshLocalPrefix */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OverrunCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* NeighborTable */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* RouteTable */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PartitionId */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Weighting */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DataVersion */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StableDataVersion */                       \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000D, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LeaderRouterId */                          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000E, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DetachedRoleCount */                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000F, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ChildRoleCount */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000010, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RouterRoleCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000011, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LeaderRoleCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000012, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AttachAttemptCount */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000013, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PartitionIdChangeCount */                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000014, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BetterPartitionAttachAttemptCount */                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000015, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ParentChangeCount */                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000016, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxTotalCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000017, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxUnicastCount */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000018, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBroadcastCount */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000019, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxAckRequestedCount */                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001A, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxAckedCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001B, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxNoAckRequestedCount */                                                  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001C, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDataCount */      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001D, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDataPollCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001E, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBeaconCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000001F, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBeaconRequestCount */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000020, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxOtherCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000021, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxRetryCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000022, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDirectMaxRetryExpiryCount */                                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000023, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxIndirectMaxRetryExpiryCount */                                          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000024, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrCcaCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000025, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrAbortCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000026, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrBusyChannelCount */                                                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000027, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxTotalCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000028, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxUnicastCount */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000029, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBroadcastCount */ \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002A, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDataCount */      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002B, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDataPollCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002C, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBeaconCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002D, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBeaconRequestCount */                                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002E, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxOtherCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000002F, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxAddressFilteredCount */                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000030, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDestAddrFilteredCount */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000031, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDuplicatedCount */                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000032, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrNoFrameCount */                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000033, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrUnknownNeighborCount */                                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000034, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrInvalidSrcAddrCount */                                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000035, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrSecCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000036, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrFcsCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000037, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrOtherCount */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000038, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActiveTimestamp */                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000039, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PendingTimestamp */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000003A, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Delay */                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000003B, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SecurityPolicy */                          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000003C, 5, ZAP_TYPE(OCTET_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ChannelPage0Mask */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x0000003D, 0, ZAP_TYPE(STRUCT),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OperationalDatasetComponents */            \
-            { ZAP_EMPTY_DEFAULT(), 0x0000003E, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                             /* ActiveNetworkFaultsList */                    \
-            { ZAP_SIMPLE_DEFAULT(0x000F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                 \
-            { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },        /* ClusterRevision */                            \
+        /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */                                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Channel */                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RoutingRole */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 17, ZAP_TYPE(CHAR_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* NetworkName */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PanId */                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ExtendedPanId */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 18, ZAP_TYPE(OCTET_STRING),                                                             \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* MeshLocalPrefix */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OverrunCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* NeighborTable */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* RouteTable */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PartitionId */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Weighting */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000B, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DataVersion */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000C, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StableDataVersion */                           \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000D, 1, ZAP_TYPE(INT8U),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* LeaderRouterId */       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000E, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* DetachedRoleCount */    \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000F, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ChildRoleCount */       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000010, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RouterRoleCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000011, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LeaderRoleCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000012, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* AttachAttemptCount */   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000013, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PartitionIdChangeCount */                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000014, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* BetterPartitionAttachAttemptCount */                                          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000015, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ParentChangeCount */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000016, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxTotalCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000017, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxUnicastCount */       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000018, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBroadcastCount */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000019, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxAckRequestedCount */  \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001A, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxAckedCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001B, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxNoAckRequestedCount */                                                      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001C, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDataCount */          \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001D, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDataPollCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001E, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBeaconCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000001F, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxBeaconRequestCount */ \
+        { ZAP_EMPTY_DEFAULT(), 0x00000020, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxOtherCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000021, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxRetryCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000022, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxDirectMaxRetryExpiryCount */                                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000023, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxIndirectMaxRetryExpiryCount */                                              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000024, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrCcaCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000025, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrAbortCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000026, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrBusyChannelCount */                                                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000027, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxTotalCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000028, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxUnicastCount */       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000029, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBroadcastCount */     \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002A, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDataCount */          \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002B, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDataPollCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002C, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBeaconCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002D, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxBeaconRequestCount */ \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002E, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxOtherCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000002F, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxAddressFilteredCount */                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000030, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDestAddrFilteredCount */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000031, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxDuplicatedCount */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000032, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrNoFrameCount */    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000033, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrUnknownNeighborCount */                                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000034, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrInvalidSrcAddrCount */                                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000035, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrSecCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000036, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrFcsCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000037, 4, ZAP_TYPE(INT32U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* RxErrOtherCount */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000038, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ActiveTimestamp */                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000039, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PendingTimestamp */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x0000003A, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* Delay */                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000003B, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SecurityPolicy */                              \
+        { ZAP_EMPTY_DEFAULT(), 0x0000003C, 5, ZAP_TYPE(OCTET_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ChannelPage0Mask */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x0000003D, 0, ZAP_TYPE(STRUCT),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OperationalDatasetComponents */                \
+        { ZAP_EMPTY_DEFAULT(), 0x0000003E, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                             /* ActiveNetworkFaultsList */                        \
+        { ZAP_SIMPLE_DEFAULT(0x000F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                     \
+        { ZAP_SIMPLE_DEFAULT(2), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },        /* ClusterRevision */                                \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */                                                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 7, ZAP_TYPE(OCTET_STRING),                                                          \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BSSID */                                   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SecurityType */                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* WiFiVersion */                             \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ChannelNumber */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(INT8S),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RSSI */                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BeaconLostCount */                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BeaconRxCount */                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketMulticastRxCount */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketMulticastTxCount */                  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketUnicastRxCount */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000A, 4, ZAP_TYPE(INT32U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketUnicastTxCount */                    \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000B, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentMaxRate */                          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000000C, 8, ZAP_TYPE(INT64U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OverrunCount */                            \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                         \
+        /* Endpoint: 0, Cluster: Wi-Fi Network Diagnostics (server) */                                                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 7, ZAP_TYPE(OCTET_STRING),                                                              \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BSSID */                                       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* SecurityType */                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* WiFiVersion */                                 \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* ChannelNumber */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 1, ZAP_TYPE(INT8S),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* RSSI */                                        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BeaconLostCount */                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* BeaconRxCount */                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketMulticastRxCount */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketMulticastTxCount */                      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000009, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketUnicastRxCount */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000A, 4, ZAP_TYPE(INT32U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PacketUnicastTxCount */                        \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000B, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* CurrentMaxRate */                              \
+        { ZAP_EMPTY_DEFAULT(), 0x0000000C, 8, ZAP_TYPE(INT64U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OverrunCount */                                \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                             \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */                                                      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PHYRate */                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* FullDuplex */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PacketRxCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PacketTxCount */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrCount */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CollisionCount */   \
-            { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OverrunCount */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000007, 1, ZAP_TYPE(BOOLEAN),                                                               \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* CarrierDetect */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000008, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TimeSinceReset */   \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */       \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */  \
+        /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */                                                          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* PHYRate */                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* FullDuplex */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PacketRxCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* PacketTxCount */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TxErrCount */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CollisionCount */       \
+        { ZAP_EMPTY_DEFAULT(), 0x00000006, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* OverrunCount */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000007, 1, ZAP_TYPE(BOOLEAN),                                                                   \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },                        /* CarrierDetect */        \
+        { ZAP_EMPTY_DEFAULT(), 0x00000008, 8, ZAP_TYPE(INT64U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TimeSinceReset */       \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */           \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */      \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Switch (server) */                                                                            \
-            { ZAP_SIMPLE_DEFAULT(2), 0x00000000, 1, ZAP_TYPE(INT8U), 0 },    /* NumberOfPositions */                               \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },      /* CurrentPosition */                                 \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
+        /* Endpoint: 0, Cluster: Switch (server) */                                                                                \
+        { ZAP_SIMPLE_DEFAULT(2), 0x00000000, 1, ZAP_TYPE(INT8U), 0 },    /* NumberOfPositions */                                   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(INT8U), 0 },      /* CurrentPosition */                                     \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Administrator Commissioning (server) */                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */      \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX),                                                            \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID),                                                             \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */                           \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                         \
+        /* Endpoint: 0, Cluster: Administrator Commissioning (server) */                                                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX),                                                                \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(VENDOR_ID),                                                                 \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminVendorId */                               \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                             \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Operational Credentials (server) */                                                           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NOCs */              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Fabrics */           \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedFabrics */  \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CommissionedFabrics */                                                    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TrustedRootCertificates */                                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(INT8U),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },                        /* CurrentFabricIndex */                              \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
+        /* Endpoint: 0, Cluster: Operational Credentials (server) */                                                               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* NOCs */                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* Fabrics */               \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedFabrics */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CommissionedFabrics */   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000004, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* TrustedRootCertificates */                                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000005, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* CurrentFabricIndex */    \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Group Key Management (server) */                                                              \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                       /* GroupKeyMap */       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* GroupTable */        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupsPerFabric */                                                     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupKeysPerFabric */                                                  \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
+        /* Endpoint: 0, Cluster: Group Key Management (server) */                                                                  \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                        /* GroupKeyMap */          \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },  /* GroupTable */           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupsPerFabric */   \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* MaxGroupKeysPerFabric */                                                      \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* ClusterRevision */    \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                       \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LabelList */         \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
+        /* Endpoint: 0, Cluster: Fixed Label (server) */                                                                           \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* LabelList */             \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: User Label (server) */                                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                 \
-              ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LabelList */                               \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                              \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                         \
+        /* Endpoint: 0, Cluster: User Label (server) */                                                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY),                                                                     \
+          ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* LabelList */                                   \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },         /* FeatureMap */                                  \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },           /* ClusterRevision */                             \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Identify (server) */                                                                          \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */      \
-            { ZAP_SIMPLE_DEFAULT(0x0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },                                /* IdentifyType */      \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
+        /* Endpoint: 1, Cluster: Identify (server) */                                                                              \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* IdentifyTime */          \
+        { ZAP_SIMPLE_DEFAULT(0x0), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },                                /* IdentifyType */          \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */            \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */       \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Groups (server) */                                                                            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 },    /* NameSupport */                                     \
-            { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
+        /* Endpoint: 1, Cluster: Groups (server) */                                                                                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 },    /* NameSupport */                                         \
+        { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: On/Off (server) */                                                                            \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* OnOff */              \
-            { ZAP_SIMPLE_DEFAULT(0x01), 0x00004000, 1, ZAP_TYPE(BOOLEAN), 0 },                            /* GlobalSceneControl */ \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnTime */            \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OffWaitTime */       \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(0), 0x00004003, 1, ZAP_TYPE(ENUM8),                                                       \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                          \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) },                            /* StartUpOnOff */                                    \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
+        /* Endpoint: 1, Cluster: On/Off (server) */                                                                                \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(BOOLEAN), ZAP_ATTRIBUTE_MASK(TOKENIZE) },  /* OnOff */                 \
+        { ZAP_SIMPLE_DEFAULT(0x01), 0x00004000, 1, ZAP_TYPE(BOOLEAN), 0 },                             /* GlobalSceneControl */    \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004001, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnTime */                \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004002, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OffWaitTime */           \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(0), 0x00004003, 1, ZAP_TYPE(ENUM8),                                                           \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                              \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) },                            /* StartUpOnOff */                                        \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                          \
+        { ZAP_SIMPLE_DEFAULT(5), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                     \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Level Control (server) */                                                                     \
-            { ZAP_SIMPLE_DEFAULT(0x01), 0x00000000, 1, ZAP_TYPE(INT8U),                                                            \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },    /* CurrentLevel */                                 \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000001, 2, ZAP_TYPE(INT16U), 0 }, /* RemainingTime */                                \
-            { ZAP_SIMPLE_DEFAULT(0x01), 0x00000002, 1, ZAP_TYPE(INT8U), 0 },    /* MinLevel */                                     \
-            { ZAP_SIMPLE_DEFAULT(0xFE), 0x00000003, 1, ZAP_TYPE(INT8U), 0 },    /* MaxLevel */                                     \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000004, 2, ZAP_TYPE(INT16U), 0 }, /* CurrentFrequency */                             \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000005, 2, ZAP_TYPE(INT16U), 0 }, /* MinFrequency */                                 \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000006, 2, ZAP_TYPE(INT16U), 0 }, /* MaxFrequency */                                 \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(1), 0x0000000F, 1, ZAP_TYPE(BITMAP8),                                                     \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Options */                                          \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000010, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnOffTransitionTime */                                                            \
-            { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000011, 1, ZAP_TYPE(INT8U),                                                            \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnLevel */                                         \
-            { ZAP_EMPTY_DEFAULT(), 0x00000012, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnTransitionTime */                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000013, 2, ZAP_TYPE(INT16U),                                                                \
-              ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OffTransitionTime */                               \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(2), 0x00000014, 1, ZAP_TYPE(INT8U),                                                       \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DefaultMoveRate */   \
-            { ZAP_SIMPLE_DEFAULT(255), 0x00004000, 1, ZAP_TYPE(INT8U),                                                             \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                                                        \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) },                            /* StartUpCurrentLevel */                             \
-            { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
-            { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
+        /* Endpoint: 1, Cluster: Level Control (server) */                                                                         \
+        { ZAP_SIMPLE_DEFAULT(0x01), 0x00000000, 1, ZAP_TYPE(INT8U),                                                                \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(NULLABLE) },    /* CurrentLevel */                                     \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000001, 2, ZAP_TYPE(INT16U), 0 }, /* RemainingTime */                                    \
+        { ZAP_SIMPLE_DEFAULT(0x01), 0x00000002, 1, ZAP_TYPE(INT8U), 0 },    /* MinLevel */                                         \
+        { ZAP_SIMPLE_DEFAULT(0xFE), 0x00000003, 1, ZAP_TYPE(INT8U), 0 },    /* MaxLevel */                                         \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000004, 2, ZAP_TYPE(INT16U), 0 }, /* CurrentFrequency */                                 \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000005, 2, ZAP_TYPE(INT16U), 0 }, /* MinFrequency */                                     \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000006, 2, ZAP_TYPE(INT16U), 0 }, /* MaxFrequency */                                     \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(1), 0x0000000F, 1, ZAP_TYPE(BITMAP8),                                                         \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) },                                /* Options */               \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000010, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* OnOffTransitionTime */   \
+        { ZAP_SIMPLE_DEFAULT(0xFF), 0x00000011, 1, ZAP_TYPE(INT8U),                                                                \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnLevel */                                             \
+        { ZAP_EMPTY_DEFAULT(), 0x00000012, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OnTransitionTime */                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000013, 2, ZAP_TYPE(INT16U),                                                                    \
+          ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* OffTransitionTime */                                   \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(2), 0x00000014, 1, ZAP_TYPE(INT8U),                                                           \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* DefaultMoveRate */       \
+        { ZAP_SIMPLE_DEFAULT(255), 0x00004000, 1, ZAP_TYPE(INT8U),                                                                 \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StartUpCurrentLevel */  \
+        { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */           \
+        { ZAP_SIMPLE_DEFAULT(6), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */      \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Descriptor (server) */                                                                        \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* DeviceTypeList */ \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */     \
-            { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */      \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* ClusterRevision */  \
+        /* Endpoint: 1, Cluster: Descriptor (server) */                                                                            \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* DeviceTypeList */     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ServerList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* ClientList */         \
+        { ZAP_EMPTY_DEFAULT(), 0x00000003, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },    /* PartsList */          \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFD, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* ClusterRevision */    \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Scenes Management (server) */                                                                 \
-            { ZAP_LONG_DEFAULTS_INDEX(14), 0x00000000, 8, ZAP_TYPE(NODE_ID),                                                       \
-              ZAP_ATTRIBUTE_MASK(NULLABLE) },                                                              /* LastConfiguredBy */  \
-            { ZAP_SIMPLE_DEFAULT(16), 0x00000001, 2, ZAP_TYPE(INT16U), 0 },                                /* SceneTableSize */    \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FabricSceneInfo */   \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                               /* FeatureMap */        \
-            { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                 /* ClusterRevision */   \
+        /* Endpoint: 1, Cluster: Scenes Management (server) */                                                                     \
+        { ZAP_LONG_DEFAULTS_INDEX(14), 0x00000000, 8, ZAP_TYPE(NODE_ID), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* LastConfiguredBy */    \
+        { ZAP_SIMPLE_DEFAULT(16), 0x00000001, 2, ZAP_TYPE(INT16U), 0 },                                  /* SceneTableSize */      \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) },   /* FabricSceneInfo */     \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                 /* FeatureMap */          \
+        { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                   /* ClusterRevision */     \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Color Control (server) */                                                                     \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* CurrentHue */        \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* CurrentSaturation */ \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000002, 2, ZAP_TYPE(INT16U), 0 },                            /* RemainingTime */     \
-            { ZAP_SIMPLE_DEFAULT(0x616B), 0x00000003, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentX */          \
-            { ZAP_SIMPLE_DEFAULT(0x607D), 0x00000004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentY */          \
-            { ZAP_SIMPLE_DEFAULT(0x00FA), 0x00000007, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorTemperatureMireds */                                                         \
-            { ZAP_SIMPLE_DEFAULT(0x01), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* ColorMode */          \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000F, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Options */            \
-            { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* NumberOfPrimaries */  \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004000, 2, ZAP_TYPE(INT16U),                                                         \
-              ZAP_ATTRIBUTE_MASK(TOKENIZE) },                                                           /* EnhancedCurrentHue */   \
-            { ZAP_SIMPLE_DEFAULT(0x01), 0x00004001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* EnhancedColorMode */    \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00004002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorLoopActive */      \
-            { ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorLoopDirection */   \
-            { ZAP_SIMPLE_DEFAULT(0x0019), 0x00004004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorLoopTime */     \
-            { ZAP_SIMPLE_DEFAULT(0x2300), 0x00004005, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStartEnhancedHue */                    \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004006, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStoredEnhancedHue */                   \
-            { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000400A, 2, ZAP_TYPE(BITMAP16), 0 }, /* ColorCapabilities */                            \
-            { ZAP_SIMPLE_DEFAULT(0x0000), 0x0000400B, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMinMireds */                   \
-            { ZAP_SIMPLE_DEFAULT(0xFEFF), 0x0000400C, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMaxMireds */                   \
-            { ZAP_EMPTY_DEFAULT(), 0x0000400D, 2, ZAP_TYPE(INT16U), 0 },        /* CoupleColorTempToLevelMinMireds */              \
-            { ZAP_MIN_MAX_DEFAULTS_INDEX(3), 0x00004010, 2, ZAP_TYPE(INT16U),                                                      \
-              ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                          \
-                  ZAP_ATTRIBUTE_MASK(NULLABLE) },                               /* StartUpColorTemperatureMireds */                \
-            { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                   \
-            { ZAP_SIMPLE_DEFAULT(7), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },      /* ClusterRevision */                              \
+        /* Endpoint: 1, Cluster: Color Control (server) */                                                                         \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000000, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* CurrentHue */            \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00000001, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* CurrentSaturation */     \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00000002, 2, ZAP_TYPE(INT16U), 0 },                            /* RemainingTime */         \
+        { ZAP_SIMPLE_DEFAULT(0x616B), 0x00000003, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentX */              \
+        { ZAP_SIMPLE_DEFAULT(0x607D), 0x00000004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentY */              \
+        { ZAP_SIMPLE_DEFAULT(0x00FA), 0x00000007, 2, ZAP_TYPE(INT16U),                                                             \
+          ZAP_ATTRIBUTE_MASK(TOKENIZE) },                                                             /* ColorTemperatureMireds */ \
+        { ZAP_SIMPLE_DEFAULT(0x01), 0x00000008, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },   /* ColorMode */              \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x0000000F, 1, ZAP_TYPE(BITMAP8), ZAP_ATTRIBUTE_MASK(WRITABLE) }, /* Options */                \
+        { ZAP_EMPTY_DEFAULT(), 0x00000010, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(NULLABLE) },        /* NumberOfPrimaries */      \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004000, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* EnhancedCurrentHue */    \
+        { ZAP_SIMPLE_DEFAULT(0x01), 0x00004001, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* EnhancedColorMode */     \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00004002, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* ColorLoopActive */       \
+        { ZAP_SIMPLE_DEFAULT(0x00), 0x00004003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) },    /* ColorLoopDirection */    \
+        { ZAP_SIMPLE_DEFAULT(0x0019), 0x00004004, 2, ZAP_TYPE(INT16U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* ColorLoopTime */         \
+        { ZAP_SIMPLE_DEFAULT(0x2300), 0x00004005, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStartEnhancedHue */                        \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x00004006, 2, ZAP_TYPE(INT16U), 0 }, /* ColorLoopStoredEnhancedHue */                       \
+        { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000400A, 2, ZAP_TYPE(BITMAP16), 0 }, /* ColorCapabilities */                                \
+        { ZAP_SIMPLE_DEFAULT(0x0000), 0x0000400B, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMinMireds */                       \
+        { ZAP_SIMPLE_DEFAULT(0xFEFF), 0x0000400C, 2, ZAP_TYPE(INT16U), 0 }, /* ColorTempPhysicalMaxMireds */                       \
+        { ZAP_EMPTY_DEFAULT(), 0x0000400D, 2, ZAP_TYPE(INT16U), 0 },        /* CoupleColorTempToLevelMinMireds */                  \
+        { ZAP_MIN_MAX_DEFAULTS_INDEX(3), 0x00004010, 2, ZAP_TYPE(INT16U),                                                          \
+          ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(TOKENIZE) | ZAP_ATTRIBUTE_MASK(WRITABLE) |                              \
+              ZAP_ATTRIBUTE_MASK(NULLABLE) },                               /* StartUpColorTemperatureMireds */                    \
+        { ZAP_SIMPLE_DEFAULT(0x1F), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                       \
+        { ZAP_SIMPLE_DEFAULT(7), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },      /* ClusterRevision */                                  \
                                                                                                                                    \
-            /* Endpoint: 1, Cluster: Occupancy Sensing (server) */                                                                 \
-            { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */                                          \
-            { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },   /* OccupancySensorType */                                \
-            { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */                          \
-            { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */     \
-            { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */                                   \
+        /* Endpoint: 1, Cluster: Occupancy Sensing (server) */                                                                     \
+        { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(BITMAP8), 0 }, /* Occupancy */                                              \
+        { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(ENUM8), 0 },   /* OccupancySensorType */                                    \
+        { ZAP_EMPTY_DEFAULT(), 0x00000002, 1, ZAP_TYPE(BITMAP8), 0 }, /* OccupancySensorTypeBitmap */                              \
+        { ZAP_EMPTY_DEFAULT(), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* FeatureMap */         \
+        { ZAP_SIMPLE_DEFAULT(4), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                    /* ClusterRevision */    \
     }
 
 // clang-format off
@@ -1187,7 +1207,8 @@
 // This is an array of EmberAfEndpointType structures.
 #define GENERATED_ENDPOINT_TYPES                                                                                                   \
     {                                                                                                                              \
-        { ZAP_CLUSTER_INDEX(0), 21, 223 }, { ZAP_CLUSTER_INDEX(21), 8, 117 },                                                      \
+        { ZAP_CLUSTER_INDEX(0), 21, 223 },                                                                                         \
+        { ZAP_CLUSTER_INDEX(21), 8, 117 },                                                                                         \
     }
 
 // Largest attribute size is needed for various buffers
@@ -1206,16 +1227,10 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
 
 // Array of endpoints that are supported, the data inside
 // the array is the endpoint number.
-#define FIXED_ENDPOINT_ARRAY                                                                                                       \
-    {                                                                                                                              \
-        0x0000, 0x0001                                                                                                             \
-    }
+#define FIXED_ENDPOINT_ARRAY { 0x0000, 0x0001 }
 
 // Array of profile ids
-#define FIXED_PROFILE_IDS                                                                                                          \
-    {                                                                                                                              \
-        0x0103, 0x0103                                                                                                             \
-    }
+#define FIXED_PROFILE_IDS { 0x0103, 0x0103 }
 
 // Array of device types
 #define FIXED_DEVICE_TYPES                                                                                                         \
@@ -1227,25 +1242,13 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE,
     }
 
 // Array of device type offsets
-#define FIXED_DEVICE_TYPE_OFFSETS                                                                                                  \
-    {                                                                                                                              \
-        0, 1                                                                                                                       \
-    }
+#define FIXED_DEVICE_TYPE_OFFSETS { 0, 1 }
 
 // Array of device type lengths
-#define FIXED_DEVICE_TYPE_LENGTHS                                                                                                  \
-    {                                                                                                                              \
-        1, 1                                                                                                                       \
-    }
+#define FIXED_DEVICE_TYPE_LENGTHS { 1, 1 }
 
 // Array of endpoint types supported on each endpoint
-#define FIXED_ENDPOINT_TYPES                                                                                                       \
-    {                                                                                                                              \
-        0, 1                                                                                                                       \
-    }
+#define FIXED_ENDPOINT_TYPES { 0, 1 }
 
 // Array of parent endpoints for each endpoint
-#define FIXED_PARENT_ENDPOINTS                                                                                                     \
-    {                                                                                                                              \
-        kInvalidEndpointId, kInvalidEndpointId                                                                                     \
-    }
+#define FIXED_PARENT_ENDPOINTS { kInvalidEndpointId, kInvalidEndpointId }
diff --git a/src/app/CASESessionManager.cpp b/src/app/CASESessionManager.cpp
index dc2656338d791a..fa22748a50feff 100644
--- a/src/app/CASESessionManager.cpp
+++ b/src/app/CASESessionManager.cpp
@@ -104,8 +104,8 @@ void CASESessionManager::FindOrEstablishSessionHelper(const ScopedNodeId & peerI
 
             if (onSetupFailure != nullptr)
             {
-                OperationalSessionSetup::ConnnectionFailureInfo failureInfo(peerId, CHIP_ERROR_NO_MEMORY,
-                                                                            SessionEstablishmentStage::kUnknown);
+                OperationalSessionSetup::ConnectionFailureInfo failureInfo(peerId, CHIP_ERROR_NO_MEMORY,
+                                                                           SessionEstablishmentStage::kUnknown);
                 onSetupFailure->mCall(onSetupFailure->mContext, failureInfo);
             }
             return;
diff --git a/src/app/OperationalSessionSetup.cpp b/src/app/OperationalSessionSetup.cpp
index 156003dec8ffd5..3a9c4be619d816 100644
--- a/src/app/OperationalSessionSetup.cpp
+++ b/src/app/OperationalSessionSetup.cpp
@@ -418,7 +418,7 @@ void OperationalSessionSetup::NotifyConnectionCallbacks(SuccessFailureCallbackLi
             }
             if (onSetupFailure != nullptr)
             {
-                ConnnectionFailureInfo failureInfo(peerId, error, stage);
+                ConnectionFailureInfo failureInfo(peerId, error, stage);
 #if CHIP_CONFIG_ENABLE_BUSY_HANDLING_FOR_OPERATIONAL_SESSION_SETUP
                 if (error == CHIP_ERROR_BUSY)
                 {
diff --git a/src/app/OperationalSessionSetup.h b/src/app/OperationalSessionSetup.h
index 343ce77b2ba37f..d5af559aec0a2a 100644
--- a/src/app/OperationalSessionSetup.h
+++ b/src/app/OperationalSessionSetup.h
@@ -157,7 +157,7 @@ typedef void (*OnDeviceConnectionRetry)(void * context, const ScopedNodeId & pee
 class DLL_EXPORT OperationalSessionSetup : public SessionEstablishmentDelegate, public AddressResolve::NodeListener
 {
 public:
-    struct ConnnectionFailureInfo
+    struct ConnectionFailureInfo
     {
         const ScopedNodeId peerId;
         CHIP_ERROR error;
@@ -170,12 +170,12 @@ class DLL_EXPORT OperationalSessionSetup : public SessionEstablishmentDelegate,
         Optional<System::Clock::Milliseconds16> requestedBusyDelay;
 #endif // CHIP_CONFIG_ENABLE_BUSY_HANDLING_FOR_OPERATIONAL_SESSION_SETUP
 
-        ConnnectionFailureInfo(const ScopedNodeId & peer, CHIP_ERROR err, SessionEstablishmentStage stage) :
+        ConnectionFailureInfo(const ScopedNodeId & peer, CHIP_ERROR err, SessionEstablishmentStage stage) :
             peerId(peer), error(err), sessionStage(stage)
         {}
     };
 
-    using OnSetupFailure = void (*)(void * context, const ConnnectionFailureInfo & failureInfo);
+    using OnSetupFailure = void (*)(void * context, const ConnectionFailureInfo & failureInfo);
 
     ~OperationalSessionSetup() override;
 
diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp
index 51adf6e8ddc143..91b8adb0721608 100644
--- a/src/app/ReadClient.cpp
+++ b/src/app/ReadClient.cpp
@@ -1306,7 +1306,7 @@ void ReadClient::HandleDeviceConnected(void * context, Messaging::ExchangeManage
     }
 }
 
-void ReadClient::HandleDeviceConnectionFailure(void * context, const OperationalSessionSetup::ConnnectionFailureInfo & failureInfo)
+void ReadClient::HandleDeviceConnectionFailure(void * context, const OperationalSessionSetup::ConnectionFailureInfo & failureInfo)
 {
     ReadClient * const _this = static_cast<ReadClient *>(context);
     VerifyOrDie(_this != nullptr);
diff --git a/src/app/ReadClient.h b/src/app/ReadClient.h
index 57852499c6ccbf..468aba012e07ae 100644
--- a/src/app/ReadClient.h
+++ b/src/app/ReadClient.h
@@ -617,7 +617,7 @@ class ReadClient : public Messaging::ExchangeDelegate
 
     static void HandleDeviceConnected(void * context, Messaging::ExchangeManager & exchangeMgr,
                                       const SessionHandle & sessionHandle);
-    static void HandleDeviceConnectionFailure(void * context, const OperationalSessionSetup::ConnnectionFailureInfo & failureInfo);
+    static void HandleDeviceConnectionFailure(void * context, const OperationalSessionSetup::ConnectionFailureInfo & failureInfo);
 
     CHIP_ERROR GetMinEventNumber(const ReadPrepareParams & aReadPrepareParams, Optional<EventNumber> & aEventMin);
 
diff --git a/src/controller/java/AndroidCallbacks-ForTestJNI.cpp b/src/controller/java/AndroidCallbacks-ForTestJNI.cpp
index ecec62d8004d84..568e0ee8474c9a 100644
--- a/src/controller/java/AndroidCallbacks-ForTestJNI.cpp
+++ b/src/controller/java/AndroidCallbacks-ForTestJNI.cpp
@@ -48,5 +48,8 @@ JNI_METHOD(void, GetConnectedDeviceCallbackForTestJni, onDeviceConnectionFailure
     GetConnectedDeviceCallback * connectedDeviceCallback = reinterpret_cast<GetConnectedDeviceCallback *>(callbackHandle);
     VerifyOrReturn(connectedDeviceCallback != nullptr, ChipLogError(Controller, "GetConnectedDeviceCallbackJni handle is nullptr"));
 
-    GetConnectedDeviceCallback::OnDeviceConnectionFailureFn(connectedDeviceCallback, ScopedNodeId(), chip::ChipError(errorCode));
+    GetConnectedDeviceCallback::OnDeviceConnectionFailureFn(
+        connectedDeviceCallback,
+        OperationalSessionSetup::ConnectionFailureInfo(
+            ScopedNodeId(), chip::ChipError(static_cast<ChipError::StorageType>(errorCode)), SessionEstablishmentStage::kUnknown));
 }
diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp
index 8e0f5e9a684e67..fbc06b522a075b 100644
--- a/src/controller/java/AndroidCallbacks.cpp
+++ b/src/controller/java/AndroidCallbacks.cpp
@@ -93,7 +93,7 @@ void GetConnectedDeviceCallback::OnDeviceConnectedFn(void * context, Messaging::
 }
 
 void GetConnectedDeviceCallback::OnDeviceConnectionFailureFn(void * context,
-                                                             const OperationalSessionSetup::ConnnectionFailureInfo & failureInfo)
+                                                             const OperationalSessionSetup::ConnectionFailureInfo & failureInfo)
 {
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     VerifyOrReturn(env != nullptr, ChipLogError(Controller, "Could not get JNIEnv for current thread"));
diff --git a/src/controller/java/AndroidCallbacks.h b/src/controller/java/AndroidCallbacks.h
index 0c49daf1b21a84..391eb05eb8172c 100644
--- a/src/controller/java/AndroidCallbacks.h
+++ b/src/controller/java/AndroidCallbacks.h
@@ -42,7 +42,7 @@ struct GetConnectedDeviceCallback
     ~GetConnectedDeviceCallback();
 
     static void OnDeviceConnectedFn(void * context, Messaging::ExchangeManager & exchangeMgr, const SessionHandle & sessionHandle);
-    static void OnDeviceConnectionFailureFn(void * context, const OperationalSessionSetup::ConnnectionFailureInfo & failureInfo);
+    static void OnDeviceConnectionFailureFn(void * context, const OperationalSessionSetup::ConnectionFailureInfo & failureInfo);
 
     Callback::Callback<OnDeviceConnected> mOnSuccess;
     Callback::Callback<OperationalSessionSetup::OnSetupFailure> mOnFailure;
diff --git a/src/controller/java/AndroidInteractionClient.cpp b/src/controller/java/AndroidInteractionClient.cpp
index 84506fddcf23d5..25f42e0502ea9d 100644
--- a/src/controller/java/AndroidInteractionClient.cpp
+++ b/src/controller/java/AndroidInteractionClient.cpp
@@ -81,10 +81,11 @@ CHIP_ERROR subscribe(JNIEnv * env, jlong handle, jlong callbackHandle, jlong dev
     if (numAttributePaths > 0)
     {
         std::unique_ptr<chip::app::AttributePathParams[]> attributePaths(new chip::app::AttributePathParams[numAttributePaths]);
-        for (uint8_t i = 0; i < numAttributePaths; i++)
+        for (size_t i = 0; i < numAttributePaths; i++)
         {
             jobject attributePathItem = nullptr;
-            SuccessOrExit(err = JniReferences::GetInstance().GetListItem(attributePathList, i, attributePathItem));
+            SuccessOrExit(err =
+                              JniReferences::GetInstance().GetListItem(attributePathList, static_cast<jint>(i), attributePathItem));
 
             EndpointId endpointId;
             ClusterId clusterId;
@@ -107,10 +108,11 @@ CHIP_ERROR subscribe(JNIEnv * env, jlong handle, jlong callbackHandle, jlong dev
     if (numDataVersionFilters > 0)
     {
         std::unique_ptr<chip::app::DataVersionFilter[]> dataVersionFilters(new chip::app::DataVersionFilter[numDataVersionFilters]);
-        for (uint8_t i = 0; i < numDataVersionFilters; i++)
+        for (size_t i = 0; i < numDataVersionFilters; i++)
         {
             jobject dataVersionFilterItem = nullptr;
-            SuccessOrExit(err = JniReferences::GetInstance().GetListItem(dataVersionFilterList, i, dataVersionFilterItem));
+            SuccessOrExit(
+                err = JniReferences::GetInstance().GetListItem(dataVersionFilterList, static_cast<jint>(i), dataVersionFilterItem));
 
             EndpointId endpointId;
             ClusterId clusterId;
@@ -141,10 +143,10 @@ CHIP_ERROR subscribe(JNIEnv * env, jlong handle, jlong callbackHandle, jlong dev
     if (numEventPaths > 0)
     {
         std::unique_ptr<chip::app::EventPathParams[]> eventPaths(new chip::app::EventPathParams[numEventPaths]);
-        for (uint8_t i = 0; i < numEventPaths; i++)
+        for (size_t i = 0; i < numEventPaths; i++)
         {
             jobject eventPathItem = nullptr;
-            SuccessOrExit(err = JniReferences::GetInstance().GetListItem(eventPathList, i, eventPathItem));
+            SuccessOrExit(err = JniReferences::GetInstance().GetListItem(eventPathList, static_cast<jint>(i), eventPathItem));
 
             EndpointId endpointId;
             ClusterId clusterId;
@@ -313,7 +315,7 @@ CHIP_ERROR write(JNIEnv * env, jlong handle, jlong callbackHandle, jlong deviceP
         device->GetExchangeManager(), callback->GetChunkedWriteCallback(),
         convertedTimedRequestTimeoutMs != 0 ? Optional<uint16_t>(convertedTimedRequestTimeoutMs) : Optional<uint16_t>::Missing());
 
-    for (uint8_t i = 0; i < listSize; i++)
+    for (jint i = 0; i < listSize; i++)
     {
         jobject attributeItem             = nullptr;
         jmethodID getEndpointIdMethod     = nullptr;
@@ -494,7 +496,7 @@ CHIP_ERROR extendableInvoke(JNIEnv * env, jlong handle, jlong callbackHandle, jl
     config.SetRemoteMaxPathsPerInvoke(device->GetSecureSession().Value()->GetRemoteSessionParameters().GetMaxPathsPerInvoke());
     SuccessOrExit(err = commandSender->SetCommandSenderConfig(config));
 
-    for (uint8_t i = 0; i < listSize; i++)
+    for (jint i = 0; i < listSize; i++)
     {
         jmethodID getEndpointIdMethod     = nullptr;
         jmethodID getClusterIdMethod      = nullptr;
@@ -845,7 +847,7 @@ CHIP_ERROR ParseAttributePathList(jobject attributePathList, std::vector<app::At
 
     ReturnErrorOnFailure(JniReferences::GetInstance().GetListSize(attributePathList, listSize));
 
-    for (uint8_t i = 0; i < listSize; i++)
+    for (jint i = 0; i < listSize; i++)
     {
         jobject attributePathItem = nullptr;
         ReturnErrorOnFailure(JniReferences::GetInstance().GetListItem(attributePathList, i, attributePathItem));
@@ -899,7 +901,7 @@ CHIP_ERROR ParseEventPathList(jobject eventPathList, std::vector<app::EventPathP
 
     ReturnErrorOnFailure(JniReferences::GetInstance().GetListSize(eventPathList, listSize));
 
-    for (uint8_t i = 0; i < listSize; i++)
+    for (jint i = 0; i < listSize; i++)
     {
         jobject eventPathItem = nullptr;
         ReturnErrorOnFailure(JniReferences::GetInstance().GetListItem(eventPathList, i, eventPathItem));
@@ -957,7 +959,7 @@ CHIP_ERROR ParseDataVersionFilterList(jobject dataVersionFilterList, std::vector
 
     ReturnErrorOnFailure(JniReferences::GetInstance().GetListSize(dataVersionFilterList, listSize));
 
-    for (uint8_t i = 0; i < listSize; i++)
+    for (jint i = 0; i < listSize; i++)
     {
         jobject dataVersionFilterItem = nullptr;
         ReturnErrorOnFailure(JniReferences::GetInstance().GetListItem(dataVersionFilterList, i, dataVersionFilterItem));
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 0f5d7e788a33c7..480e30f704ab29 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -14,6 +14,7 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
+import("//build_overrides/pigweed.gni")
 import("${chip_root}/build/chip/buildconfig_header.gni")
 import("${chip_root}/build/chip/java/config.gni")
 import("${chip_root}/build/chip/java/rules.gni")
@@ -223,6 +224,7 @@ if (chip_link_tests) {
       ":android_chip_im_jni",
       ":jni",
       "${chip_root}/src/messaging/tests:helpers",
+      dir_pw_unit_test,
     ]
 
     if (matter_enable_java_compilation) {
diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
index a0482b41db65b8..65f0d13f01d06e 100644
--- a/src/controller/java/CHIPDeviceController-JNI.cpp
+++ b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -1382,7 +1382,7 @@ JNI_METHOD(void, getConnectedDevicePointer)(JNIEnv * env, jobject self, jlong ha
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(Controller, "GetConnectedDevice failed: %" CHIP_ERROR_FORMAT, err.Format());
-        OperationalSessionSetup::ConnnectionFailureInfo failureInfo(
+        OperationalSessionSetup::ConnectionFailureInfo failureInfo(
             chip::ScopedNodeId(static_cast<chip::NodeId>(nodeId), wrapper->Controller()->GetFabricIndex()), err,
             SessionEstablishmentStage::kUnknown);
         connectedDeviceCallback->mOnFailure.mCall(&connectedDeviceCallback->mOnFailure.mContext, failureInfo);
@@ -1807,7 +1807,7 @@ JNI_METHOD(jobject, getNetworkLocation)(JNIEnv * env, jobject self, jlong handle
     AndroidDeviceControllerWrapper * wrapper = AndroidDeviceControllerWrapper::FromJNIHandle(handle);
 
     Transport::PeerAddress addr;
-    jobject networkLocation;
+    jobject networkLocation = nullptr;
     char addrStr[50];
 
     CHIP_ERROR err = wrapper->Controller()->GetPeerAddress(static_cast<chip::NodeId>(deviceId), addr);
diff --git a/src/credentials/attestation_verifier/TestDACRevocationDelegateImpl.cpp b/src/credentials/attestation_verifier/TestDACRevocationDelegateImpl.cpp
index 4e1978525e7327..0db03372195184 100644
--- a/src/credentials/attestation_verifier/TestDACRevocationDelegateImpl.cpp
+++ b/src/credentials/attestation_verifier/TestDACRevocationDelegateImpl.cpp
@@ -23,7 +23,6 @@
 
 #include <fstream>
 #include <json/json.h>
-#include <string>
 
 using namespace chip::Crypto;
 
@@ -69,10 +68,10 @@ void TestDACRevocationDelegateImpl::ClearDeviceAttestationRevocationSetPath()
 bool TestDACRevocationDelegateImpl::IsEntryInRevocationSet(const CharSpan & akidHexStr, const CharSpan & issuerNameBase64Str,
                                                            const CharSpan & serialNumberHexStr)
 {
-    std::ifstream file(mDeviceAttestationRevocationSetPath.data());
+    std::ifstream file(mDeviceAttestationRevocationSetPath.c_str());
     if (!file.is_open())
     {
-        ChipLogError(NotSpecified, "Failed to open file: %s", mDeviceAttestationRevocationSetPath.data());
+        ChipLogError(NotSpecified, "Failed to open file: %s", mDeviceAttestationRevocationSetPath.c_str());
         return false;
     }
 
@@ -188,19 +187,19 @@ void TestDACRevocationDelegateImpl::CheckForRevokedDACChain(
         onCompletion->mCall(onCompletion->mContext, info, attestationError);
     }
 
-    ChipLogDetail(NotSpecified, "Checking for revoked DAC in %s", mDeviceAttestationRevocationSetPath.data());
+    ChipLogDetail(NotSpecified, "Checking for revoked DAC in %s", mDeviceAttestationRevocationSetPath.c_str());
 
     if (IsCertificateRevoked(info.dacDerBuffer))
     {
-        ChipLogProgress(NotSpecified, "Found revoked DAC in %s", mDeviceAttestationRevocationSetPath.data());
+        ChipLogProgress(NotSpecified, "Found revoked DAC in %s", mDeviceAttestationRevocationSetPath.c_str());
         attestationError = AttestationVerificationResult::kDacRevoked;
     }
 
-    ChipLogDetail(NotSpecified, "Checking for revoked PAI in %s", mDeviceAttestationRevocationSetPath.data());
+    ChipLogDetail(NotSpecified, "Checking for revoked PAI in %s", mDeviceAttestationRevocationSetPath.c_str());
 
     if (IsCertificateRevoked(info.paiDerBuffer))
     {
-        ChipLogProgress(NotSpecified, "Found revoked PAI in %s", mDeviceAttestationRevocationSetPath.data());
+        ChipLogProgress(NotSpecified, "Found revoked PAI in %s", mDeviceAttestationRevocationSetPath.c_str());
 
         if (attestationError == AttestationVerificationResult::kDacRevoked)
         {
diff --git a/src/credentials/attestation_verifier/TestDACRevocationDelegateImpl.h b/src/credentials/attestation_verifier/TestDACRevocationDelegateImpl.h
index c820e56f5f6ce3..2dc169c2b67837 100644
--- a/src/credentials/attestation_verifier/TestDACRevocationDelegateImpl.h
+++ b/src/credentials/attestation_verifier/TestDACRevocationDelegateImpl.h
@@ -19,7 +19,8 @@
 
 #include <credentials/attestation_verifier/DeviceAttestationVerifier.h>
 #include <lib/support/Span.h>
-#include <string_view>
+
+#include <string>
 
 namespace chip {
 namespace Credentials {
@@ -58,7 +59,7 @@ class TestDACRevocationDelegateImpl : public DeviceAttestationRevocationDelegate
                                 const CharSpan & serialNumberHexStr);
     bool IsCertificateRevoked(const ByteSpan & certDer);
 
-    std::string_view mDeviceAttestationRevocationSetPath;
+    std::string mDeviceAttestationRevocationSetPath;
 };
 
 } // namespace Credentials
diff --git a/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h b/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h
index e4d2dda652d0d0..81715b6a87a743 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h
@@ -70,7 +70,7 @@ class MTRDeviceConnectionBridge : public chip::ReferenceCounted<MTRDeviceConnect
 
     static void OnConnected(
         void * context, chip::Messaging::ExchangeManager & exchangeMgr, const chip::SessionHandle & sessionHandle);
-    static void OnConnectionFailure(void * context, const chip::OperationalSessionSetup::ConnnectionFailureInfo & failureInfo);
+    static void OnConnectionFailure(void * context, const chip::OperationalSessionSetup::ConnectionFailureInfo & failureInfo);
 };
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.mm b/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.mm
index 8f712ab76d3b6b..855ba12ad919cc 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.mm
@@ -28,7 +28,7 @@
     object->Release();
 }
 
-void MTRDeviceConnectionBridge::OnConnectionFailure(void * context, const chip::OperationalSessionSetup::ConnnectionFailureInfo & failureInfo)
+void MTRDeviceConnectionBridge::OnConnectionFailure(void * context, const chip::OperationalSessionSetup::ConnectionFailureInfo & failureInfo)
 {
     NSNumber * retryDelay;
     if (failureInfo.requestedBusyDelay.HasValue()) {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index 6f586f7fcba17d..67025a001ab842 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -434,21 +434,21 @@ @implementation MTRBaseClusterIdentify (Deprecated)
 - (void)identifyWithParams:(MTRIdentifyClusterIdentifyParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self identifyWithParams:params completion:
-                                        completionHandler];
+            completionHandler];
 }
 - (void)triggerEffectWithParams:(MTRIdentifyClusterTriggerEffectParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self triggerEffectWithParams:params completion:
-                                             completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeIdentifyTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeIdentifyTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeIdentifyTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -471,27 +471,27 @@ - (void)subscribeAttributeIdentifyTimeWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeIdentifyTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeIdentifyTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeIdentifyTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeIdentifyTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeIdentifyTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeIdentifyTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -506,27 +506,27 @@ - (void)subscribeAttributeIdentifyTypeWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeIdentifyTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeIdentifyTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeIdentifyTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -541,27 +541,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -576,27 +576,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -611,27 +611,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -646,27 +646,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -681,18 +681,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -1114,39 +1114,39 @@ @implementation MTRBaseClusterGroups (Deprecated)
 - (void)addGroupWithParams:(MTRGroupsClusterAddGroupParams *)params completionHandler:(void (^)(MTRGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self addGroupWithParams:params completion:
-                                        ^(MTRGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error) {
-                                            // Cast is safe because subclass does not add any selectors.
-                                            completionHandler(static_cast<MTRGroupsClusterAddGroupResponseParams *>(data), error);
-                                        }];
+            ^(MTRGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupsClusterAddGroupResponseParams *>(data), error);
+            }];
 }
 - (void)viewGroupWithParams:(MTRGroupsClusterViewGroupParams *)params completionHandler:(void (^)(MTRGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self viewGroupWithParams:params completion:
-                                         ^(MTRGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error) {
-                                             // Cast is safe because subclass does not add any selectors.
-                                             completionHandler(static_cast<MTRGroupsClusterViewGroupResponseParams *>(data), error);
-                                         }];
+            ^(MTRGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupsClusterViewGroupResponseParams *>(data), error);
+            }];
 }
 - (void)getGroupMembershipWithParams:(MTRGroupsClusterGetGroupMembershipParams *)params completionHandler:(void (^)(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getGroupMembershipWithParams:params completion:
-                                                  ^(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                      // Cast is safe because subclass does not add any selectors.
-                                                      completionHandler(static_cast<MTRGroupsClusterGetGroupMembershipResponseParams *>(data), error);
-                                                  }];
+            ^(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupsClusterGetGroupMembershipResponseParams *>(data), error);
+            }];
 }
 - (void)removeGroupWithParams:(MTRGroupsClusterRemoveGroupParams *)params completionHandler:(void (^)(MTRGroupsClusterRemoveGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self removeGroupWithParams:params completion:
-                                           ^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable data, NSError * _Nullable error) {
-                                               // Cast is safe because subclass does not add any selectors.
-                                               completionHandler(static_cast<MTRGroupsClusterRemoveGroupResponseParams *>(data), error);
-                                           }];
+            ^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupsClusterRemoveGroupResponseParams *>(data), error);
+            }];
 }
 - (void)removeAllGroupsWithParams:(MTRGroupsClusterRemoveAllGroupsParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self removeAllGroupsWithParams:params completion:
-                                               completionHandler];
+            completionHandler];
 }
 - (void)removeAllGroupsWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -1155,16 +1155,16 @@ - (void)removeAllGroupsWithCompletionHandler:(MTRStatusCompletion)completionHand
 - (void)addGroupIfIdentifyingWithParams:(MTRGroupsClusterAddGroupIfIdentifyingParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self addGroupIfIdentifyingWithParams:params completion:
-                                                     completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeNameSupportWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNameSupportWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNameSupportWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -1179,27 +1179,27 @@ - (void)subscribeAttributeNameSupportWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNameSupportWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNameSupportWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNameSupportWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -1214,27 +1214,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -1249,27 +1249,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -1284,27 +1284,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -1319,27 +1319,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -1354,18 +1354,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -2032,7 +2032,7 @@ @implementation MTRBaseClusterOnOff (Deprecated)
 - (void)offWithParams:(MTROnOffClusterOffParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self offWithParams:params completion:
-                                   completionHandler];
+            completionHandler];
 }
 - (void)offWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -2041,7 +2041,7 @@ - (void)offWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)onWithParams:(MTROnOffClusterOnParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self onWithParams:params completion:
-                                  completionHandler];
+            completionHandler];
 }
 - (void)onWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -2050,7 +2050,7 @@ - (void)onWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)toggleWithParams:(MTROnOffClusterToggleParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self toggleWithParams:params completion:
-                                      completionHandler];
+            completionHandler];
 }
 - (void)toggleWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -2059,12 +2059,12 @@ - (void)toggleWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)offWithEffectWithParams:(MTROnOffClusterOffWithEffectParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self offWithEffectWithParams:params completion:
-                                             completionHandler];
+            completionHandler];
 }
 - (void)onWithRecallGlobalSceneWithParams:(MTROnOffClusterOnWithRecallGlobalSceneParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self onWithRecallGlobalSceneWithParams:params completion:
-                                                       completionHandler];
+            completionHandler];
 }
 - (void)onWithRecallGlobalSceneWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -2073,16 +2073,16 @@ - (void)onWithRecallGlobalSceneWithCompletionHandler:(MTRStatusCompletion)comple
 - (void)onWithTimedOffWithParams:(MTROnOffClusterOnWithTimedOffParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self onWithTimedOffWithParams:params completion:
-                                              completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeOnOffWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnOffWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOnOffWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                         params:(MTRSubscribeParams * _Nullable)params
@@ -2097,27 +2097,27 @@ - (void)subscribeAttributeOnOffWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOnOffWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOnOffWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnOffWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGlobalSceneControlWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGlobalSceneControlWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGlobalSceneControlWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -2132,27 +2132,27 @@ - (void)subscribeAttributeGlobalSceneControlWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGlobalSceneControlWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeGlobalSceneControlWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGlobalSceneControlWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOnTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOnTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -2175,27 +2175,27 @@ - (void)subscribeAttributeOnTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOnTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOnTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOffWaitTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOffWaitTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOffWaitTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -2218,27 +2218,27 @@ - (void)subscribeAttributeOffWaitTimeWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOffWaitTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOffWaitTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOffWaitTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeStartUpOnOffWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartUpOnOffWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeStartUpOnOffWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -2261,27 +2261,27 @@ - (void)subscribeAttributeStartUpOnOffWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStartUpOnOffWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeStartUpOnOffWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartUpOnOffWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -2296,27 +2296,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -2331,27 +2331,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -2366,27 +2366,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -2401,27 +2401,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -2436,18 +2436,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -3626,56 +3626,56 @@ @implementation MTRBaseClusterLevelControl (Deprecated)
 - (void)moveToLevelWithParams:(MTRLevelControlClusterMoveToLevelParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToLevelWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 - (void)moveWithParams:(MTRLevelControlClusterMoveParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveWithParams:params completion:
-                                    completionHandler];
+            completionHandler];
 }
 - (void)stepWithParams:(MTRLevelControlClusterStepParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepWithParams:params completion:
-                                    completionHandler];
+            completionHandler];
 }
 - (void)stopWithParams:(MTRLevelControlClusterStopParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stopWithParams:params completion:
-                                    completionHandler];
+            completionHandler];
 }
 - (void)moveToLevelWithOnOffWithParams:(MTRLevelControlClusterMoveToLevelWithOnOffParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToLevelWithOnOffWithParams:params completion:
-                                                    completionHandler];
+            completionHandler];
 }
 - (void)moveWithOnOffWithParams:(MTRLevelControlClusterMoveWithOnOffParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveWithOnOffWithParams:params completion:
-                                             completionHandler];
+            completionHandler];
 }
 - (void)stepWithOnOffWithParams:(MTRLevelControlClusterStepWithOnOffParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepWithOnOffWithParams:params completion:
-                                             completionHandler];
+            completionHandler];
 }
 - (void)stopWithOnOffWithParams:(MTRLevelControlClusterStopWithOnOffParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stopWithOnOffWithParams:params completion:
-                                             completionHandler];
+            completionHandler];
 }
 - (void)moveToClosestFrequencyWithParams:(MTRLevelControlClusterMoveToClosestFrequencyParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToClosestFrequencyWithParams:params completion:
-                                                      completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeCurrentLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentLevelWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentLevelWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -3690,27 +3690,27 @@ - (void)subscribeAttributeCurrentLevelWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentLevelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentLevelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentLevelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRemainingTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRemainingTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -3725,27 +3725,27 @@ - (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRemainingTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRemainingTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRemainingTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinLevelWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinLevelWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -3760,27 +3760,27 @@ - (void)subscribeAttributeMinLevelWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinLevelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinLevelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinLevelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxLevelWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxLevelWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -3795,27 +3795,27 @@ - (void)subscribeAttributeMaxLevelWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxLevelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxLevelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxLevelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentFrequencyWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -3830,27 +3830,27 @@ - (void)subscribeAttributeCurrentFrequencyWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentFrequencyWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentFrequencyWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentFrequencyWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinFrequencyWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -3865,27 +3865,27 @@ - (void)subscribeAttributeMinFrequencyWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinFrequencyWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinFrequencyWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinFrequencyWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxFrequencyWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -3900,27 +3900,27 @@ - (void)subscribeAttributeMaxFrequencyWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxFrequencyWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxFrequencyWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxFrequencyWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOptionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOptionsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -3943,27 +3943,27 @@ - (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOptionsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOptionsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOptionsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOnOffTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnOffTransitionTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOnOffTransitionTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -3986,27 +3986,27 @@ - (void)subscribeAttributeOnOffTransitionTimeWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOnOffTransitionTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOnOffTransitionTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnOffTransitionTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOnLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnLevelWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOnLevelWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -4029,27 +4029,27 @@ - (void)subscribeAttributeOnLevelWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOnLevelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOnLevelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnLevelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOnTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnTransitionTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOnTransitionTimeWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -4072,27 +4072,27 @@ - (void)subscribeAttributeOnTransitionTimeWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOnTransitionTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOnTransitionTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnTransitionTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOffTransitionTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOffTransitionTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOffTransitionTimeWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -4115,27 +4115,27 @@ - (void)subscribeAttributeOffTransitionTimeWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOffTransitionTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOffTransitionTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOffTransitionTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeDefaultMoveRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDefaultMoveRateWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeDefaultMoveRateWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -4158,27 +4158,27 @@ - (void)subscribeAttributeDefaultMoveRateWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDefaultMoveRateWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeDefaultMoveRateWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDefaultMoveRateWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeStartUpCurrentLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartUpCurrentLevelWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeStartUpCurrentLevelWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -4201,27 +4201,27 @@ - (void)subscribeAttributeStartUpCurrentLevelWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStartUpCurrentLevelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeStartUpCurrentLevelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartUpCurrentLevelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -4236,27 +4236,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -4271,27 +4271,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -4306,27 +4306,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -4341,27 +4341,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -4376,18 +4376,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -5024,10 +5024,10 @@ @implementation MTRBaseClusterDescriptor (Deprecated)
 - (void)readAttributeDeviceListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDeviceTypeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeDeviceListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -5042,27 +5042,27 @@ - (void)subscribeAttributeDeviceListWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDeviceTypeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeDeviceListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDeviceTypeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                   }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeServerListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeServerListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeServerListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -5077,27 +5077,27 @@ - (void)subscribeAttributeServerListWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeServerListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeServerListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeServerListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeClientListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClientListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClientListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -5112,27 +5112,27 @@ - (void)subscribeAttributeClientListWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClientListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeClientListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClientListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributePartsListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePartsListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributePartsListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -5147,27 +5147,27 @@ - (void)subscribeAttributePartsListWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePartsListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                           }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributePartsListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePartsListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -5182,27 +5182,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -5217,27 +5217,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -5252,27 +5252,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -5287,27 +5287,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -5322,18 +5322,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -5671,10 +5671,10 @@ @implementation MTRBaseClusterBinding (Deprecated)
 - (void)readAttributeBindingWithParams:(MTRReadParams * _Nullable)params completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBindingWithParams:params completion:
-                                                    ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        // Cast is safe because subclass does not add any selectors.
-                                                        completionHandler(static_cast<NSArray *>(value), error);
-                                                    }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeBindingWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -5697,27 +5697,27 @@ - (void)subscribeAttributeBindingWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBindingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeBindingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBindingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -5732,27 +5732,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -5767,27 +5767,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -5802,27 +5802,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -5837,27 +5837,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -5872,18 +5872,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -6569,10 +6569,10 @@ @implementation MTRBaseClusterAccessControl (Deprecated)
 - (void)readAttributeAclWithParams:(MTRReadParams * _Nullable)params completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACLWithParams:params completion:
-                                                ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                    // Cast is safe because subclass does not add any selectors.
-                                                    completionHandler(static_cast<NSArray *>(value), error);
-                                                }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeAclWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -6595,27 +6595,27 @@ - (void)subscribeAttributeAclWithMinInterval:(NSNumber * _Nonnull)minInterval ma
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeACLWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAclWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACLWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeExtensionWithParams:(MTRReadParams * _Nullable)params completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeExtensionWithParams:params completion:
-                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                          // Cast is safe because subclass does not add any selectors.
-                                                          completionHandler(static_cast<NSArray *>(value), error);
-                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeExtensionWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -6638,27 +6638,27 @@ - (void)subscribeAttributeExtensionWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeExtensionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                           }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeExtensionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeExtensionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeSubjectsPerAccessControlEntryWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSubjectsPerAccessControlEntryWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSubjectsPerAccessControlEntryWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -6673,27 +6673,27 @@ - (void)subscribeAttributeSubjectsPerAccessControlEntryWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSubjectsPerAccessControlEntryWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSubjectsPerAccessControlEntryWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSubjectsPerAccessControlEntryWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTargetsPerAccessControlEntryWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTargetsPerAccessControlEntryWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTargetsPerAccessControlEntryWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                params:(MTRSubscribeParams * _Nullable)params
@@ -6708,27 +6708,27 @@ - (void)subscribeAttributeTargetsPerAccessControlEntryWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTargetsPerAccessControlEntryWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTargetsPerAccessControlEntryWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTargetsPerAccessControlEntryWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeAccessControlEntriesPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAccessControlEntriesPerFabricWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAccessControlEntriesPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -6743,27 +6743,27 @@ - (void)subscribeAttributeAccessControlEntriesPerFabricWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAccessControlEntriesPerFabricWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeAccessControlEntriesPerFabricWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAccessControlEntriesPerFabricWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -6778,27 +6778,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -6813,27 +6813,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -6848,27 +6848,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -6883,27 +6883,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -6918,18 +6918,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -7563,71 +7563,71 @@ @implementation MTRBaseClusterActions (Deprecated)
 - (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self instantActionWithParams:params completion:
-                                             completionHandler];
+            completionHandler];
 }
 - (void)instantActionWithTransitionWithParams:(MTRActionsClusterInstantActionWithTransitionParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self instantActionWithTransitionWithParams:params completion:
-                                                           completionHandler];
+            completionHandler];
 }
 - (void)startActionWithParams:(MTRActionsClusterStartActionParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self startActionWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 - (void)startActionWithDurationWithParams:(MTRActionsClusterStartActionWithDurationParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self startActionWithDurationWithParams:params completion:
-                                                       completionHandler];
+            completionHandler];
 }
 - (void)stopActionWithParams:(MTRActionsClusterStopActionParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stopActionWithParams:params completion:
-                                          completionHandler];
+            completionHandler];
 }
 - (void)pauseActionWithParams:(MTRActionsClusterPauseActionParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self pauseActionWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 - (void)pauseActionWithDurationWithParams:(MTRActionsClusterPauseActionWithDurationParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self pauseActionWithDurationWithParams:params completion:
-                                                       completionHandler];
+            completionHandler];
 }
 - (void)resumeActionWithParams:(MTRActionsClusterResumeActionParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self resumeActionWithParams:params completion:
-                                            completionHandler];
+            completionHandler];
 }
 - (void)enableActionWithParams:(MTRActionsClusterEnableActionParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enableActionWithParams:params completion:
-                                            completionHandler];
+            completionHandler];
 }
 - (void)enableActionWithDurationWithParams:(MTRActionsClusterEnableActionWithDurationParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enableActionWithDurationWithParams:params completion:
-                                                        completionHandler];
+            completionHandler];
 }
 - (void)disableActionWithParams:(MTRActionsClusterDisableActionParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self disableActionWithParams:params completion:
-                                             completionHandler];
+            completionHandler];
 }
 - (void)disableActionWithDurationWithParams:(MTRActionsClusterDisableActionWithDurationParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self disableActionWithDurationWithParams:params completion:
-                                                         completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeActionListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActionListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeActionListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -7642,27 +7642,27 @@ - (void)subscribeAttributeActionListWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActionListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeActionListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActionListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeEndpointListsWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEndpointListsWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeEndpointListsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -7677,27 +7677,27 @@ - (void)subscribeAttributeEndpointListsWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEndpointListsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeEndpointListsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEndpointListsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeSetupURLWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSetupURLWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSetupURLWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -7712,27 +7712,27 @@ - (void)subscribeAttributeSetupURLWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSetupURLWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                          }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeSetupURLWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSetupURLWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -7747,27 +7747,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -7782,27 +7782,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -7817,27 +7817,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -7852,27 +7852,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -7887,18 +7887,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -9079,7 +9079,7 @@ @implementation MTRBaseClusterBasic (Deprecated)
 - (void)mfgSpecificPingWithParams:(MTRBasicClusterMfgSpecificPingParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self mfgSpecificPingWithParams:params completion:
-                                               completionHandler];
+            completionHandler];
 }
 - (void)mfgSpecificPingWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -9089,10 +9089,10 @@ - (void)mfgSpecificPingWithCompletionHandler:(MTRStatusCompletion)completionHand
 - (void)readAttributeDataModelRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDataModelRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeDataModelRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -9107,27 +9107,27 @@ - (void)subscribeAttributeDataModelRevisionWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDataModelRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeDataModelRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDataModelRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeVendorNameWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorNameWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -9142,27 +9142,27 @@ - (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeVendorNameWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                            }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeVendorNameWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorNameWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                               }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeVendorIDWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorIDWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -9177,27 +9177,27 @@ - (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeVendorIDWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeVendorIDWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorIDWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeProductNameWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductNameWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeProductNameWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -9212,27 +9212,27 @@ - (void)subscribeAttributeProductNameWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeProductNameWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeProductNameWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductNameWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeProductIDWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductIDWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -9247,27 +9247,27 @@ - (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeProductIDWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeProductIDWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductIDWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNodeLabelWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNodeLabelWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -9290,27 +9290,27 @@ - (void)subscribeAttributeNodeLabelWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNodeLabelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                           }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeNodeLabelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNodeLabelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeLocationWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocationWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)writeAttributeLocationWithValue:(NSString * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -9333,27 +9333,27 @@ - (void)subscribeAttributeLocationWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLocationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                          }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeLocationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeHardwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHardwareVersionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeHardwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -9368,27 +9368,27 @@ - (void)subscribeAttributeHardwareVersionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeHardwareVersionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeHardwareVersionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHardwareVersionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeHardwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHardwareVersionStringWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeHardwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -9403,27 +9403,27 @@ - (void)subscribeAttributeHardwareVersionStringWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeHardwareVersionStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                       }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeHardwareVersionStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHardwareVersionStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                          }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeSoftwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSoftwareVersionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSoftwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -9438,27 +9438,27 @@ - (void)subscribeAttributeSoftwareVersionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSoftwareVersionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSoftwareVersionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSoftwareVersionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSoftwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSoftwareVersionStringWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSoftwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -9473,27 +9473,27 @@ - (void)subscribeAttributeSoftwareVersionStringWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSoftwareVersionStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                       }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeSoftwareVersionStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSoftwareVersionStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                          }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeManufacturingDateWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeManufacturingDateWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeManufacturingDateWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -9508,27 +9508,27 @@ - (void)subscribeAttributeManufacturingDateWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeManufacturingDateWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                   }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeManufacturingDateWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeManufacturingDateWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                      }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributePartNumberWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePartNumberWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributePartNumberWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -9543,27 +9543,27 @@ - (void)subscribeAttributePartNumberWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePartNumberWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                            }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributePartNumberWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePartNumberWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                               }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeProductURLWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductURLWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeProductURLWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -9578,27 +9578,27 @@ - (void)subscribeAttributeProductURLWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeProductURLWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                            }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeProductURLWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductURLWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                               }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeProductLabelWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductLabelWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeProductLabelWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -9613,27 +9613,27 @@ - (void)subscribeAttributeProductLabelWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeProductLabelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeProductLabelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductLabelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                 }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeSerialNumberWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSerialNumberWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSerialNumberWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -9648,27 +9648,27 @@ - (void)subscribeAttributeSerialNumberWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSerialNumberWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeSerialNumberWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSerialNumberWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                 }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeLocalConfigDisabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocalConfigDisabledWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeLocalConfigDisabledWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -9691,27 +9691,27 @@ - (void)subscribeAttributeLocalConfigDisabledWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLocalConfigDisabledWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLocalConfigDisabledWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocalConfigDisabledWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeReachableWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeReachableWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeReachableWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -9726,27 +9726,27 @@ - (void)subscribeAttributeReachableWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeReachableWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeReachableWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeReachableWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUniqueIDWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUniqueIDWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeUniqueIDWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -9761,27 +9761,27 @@ - (void)subscribeAttributeUniqueIDWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUniqueIDWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                          }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeUniqueIDWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUniqueIDWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeCapabilityMinimaWithCompletionHandler:(void (^)(MTRBasicClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCapabilityMinimaWithCompletion:
-              ^(MTRBasicInformationClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<MTRBasicClusterCapabilityMinimaStruct *>(value), error);
-              }];
+            ^(MTRBasicInformationClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRBasicClusterCapabilityMinimaStruct *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCapabilityMinimaWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -9796,27 +9796,27 @@ - (void)subscribeAttributeCapabilityMinimaWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCapabilityMinimaWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(MTRBasicInformationClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<MTRBasicClusterCapabilityMinimaStruct *>(value), error);
-                                                                                                                                  }];
+            ^(MTRBasicInformationClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<MTRBasicClusterCapabilityMinimaStruct *>(value), error);
+            }];
 }
 + (void)readAttributeCapabilityMinimaWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(MTRBasicClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCapabilityMinimaWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(MTRBasicInformationClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<MTRBasicClusterCapabilityMinimaStruct *>(value), error);
-                                                                                                                                     }];
+            ^(MTRBasicInformationClusterCapabilityMinimaStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRBasicClusterCapabilityMinimaStruct *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -9831,27 +9831,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -9866,27 +9866,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -9901,27 +9901,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -9936,27 +9936,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -9971,18 +9971,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -10295,32 +10295,32 @@ @implementation MTRBaseClusterOtaSoftwareUpdateProvider (Deprecated)
 - (void)queryImageWithParams:(MTROtaSoftwareUpdateProviderClusterQueryImageParams *)params completionHandler:(void (^)(MTROtaSoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self queryImageWithParams:params completion:
-                                          ^(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data, NSError * _Nullable error) {
-                                              // Cast is safe because subclass does not add any selectors.
-                                              completionHandler(static_cast<MTROtaSoftwareUpdateProviderClusterQueryImageResponseParams *>(data), error);
-                                          }];
+            ^(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROtaSoftwareUpdateProviderClusterQueryImageResponseParams *>(data), error);
+            }];
 }
 - (void)applyUpdateRequestWithParams:(MTROtaSoftwareUpdateProviderClusterApplyUpdateRequestParams *)params completionHandler:(void (^)(MTROtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self applyUpdateRequestWithParams:params completion:
-                                                  ^(MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                      // Cast is safe because subclass does not add any selectors.
-                                                      completionHandler(static_cast<MTROtaSoftwareUpdateProviderClusterApplyUpdateResponseParams *>(data), error);
-                                                  }];
+            ^(MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROtaSoftwareUpdateProviderClusterApplyUpdateResponseParams *>(data), error);
+            }];
 }
 - (void)notifyUpdateAppliedWithParams:(MTROtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self notifyUpdateAppliedWithParams:params completion:
-                                                   completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -10335,27 +10335,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -10370,27 +10370,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -10405,27 +10405,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -10440,27 +10440,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -10475,18 +10475,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -10946,16 +10946,16 @@ @implementation MTRBaseClusterOtaSoftwareUpdateRequestor (Deprecated)
 - (void)announceOtaProviderWithParams:(MTROtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self announceOTAProviderWithParams:params completion:
-                                                   completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeDefaultOtaProvidersWithParams:(MTRReadParams * _Nullable)params completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDefaultOTAProvidersWithParams:params completion:
-                                                                ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                    completionHandler(static_cast<NSArray *>(value), error);
-                                                                }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeDefaultOtaProvidersWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -10978,27 +10978,27 @@ - (void)subscribeAttributeDefaultOtaProvidersWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDefaultOTAProvidersWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeDefaultOtaProvidersWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDefaultOTAProvidersWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeUpdatePossibleWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUpdatePossibleWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeUpdatePossibleWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -11013,27 +11013,27 @@ - (void)subscribeAttributeUpdatePossibleWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUpdatePossibleWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUpdatePossibleWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUpdatePossibleWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUpdateStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUpdateStateWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeUpdateStateWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -11048,27 +11048,27 @@ - (void)subscribeAttributeUpdateStateWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUpdateStateWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUpdateStateWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUpdateStateWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUpdateStateProgressWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUpdateStateProgressWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeUpdateStateProgressWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -11083,27 +11083,27 @@ - (void)subscribeAttributeUpdateStateProgressWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUpdateStateProgressWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUpdateStateProgressWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUpdateStateProgressWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -11118,27 +11118,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -11153,27 +11153,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -11188,27 +11188,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -11223,27 +11223,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -11258,18 +11258,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -11606,10 +11606,10 @@ @implementation MTRBaseClusterLocalizationConfiguration (Deprecated)
 - (void)readAttributeActiveLocaleWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveLocaleWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)writeAttributeActiveLocaleWithValue:(NSString * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -11632,27 +11632,27 @@ - (void)subscribeAttributeActiveLocaleWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActiveLocaleWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeActiveLocaleWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveLocaleWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                 }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeSupportedLocalesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedLocalesWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSupportedLocalesWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -11667,27 +11667,27 @@ - (void)subscribeAttributeSupportedLocalesWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSupportedLocalesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeSupportedLocalesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedLocalesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -11702,27 +11702,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -11737,27 +11737,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -11772,27 +11772,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -11807,27 +11807,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -11842,18 +11842,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -12254,10 +12254,10 @@ @implementation MTRBaseClusterTimeFormatLocalization (Deprecated)
 - (void)readAttributeHourFormatWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHourFormatWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeHourFormatWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -12280,27 +12280,27 @@ - (void)subscribeAttributeHourFormatWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeHourFormatWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeHourFormatWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHourFormatWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeActiveCalendarTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveCalendarTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeActiveCalendarTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -12323,27 +12323,27 @@ - (void)subscribeAttributeActiveCalendarTypeWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActiveCalendarTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeActiveCalendarTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveCalendarTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSupportedCalendarTypesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedCalendarTypesWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSupportedCalendarTypesWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -12358,27 +12358,27 @@ - (void)subscribeAttributeSupportedCalendarTypesWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSupportedCalendarTypesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeSupportedCalendarTypesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedCalendarTypesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                           }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -12393,27 +12393,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -12428,27 +12428,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -12463,27 +12463,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -12498,27 +12498,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -12533,18 +12533,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -12845,10 +12845,10 @@ @implementation MTRBaseClusterUnitLocalization (Deprecated)
 - (void)readAttributeTemperatureUnitWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTemperatureUnitWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeTemperatureUnitWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -12871,27 +12871,27 @@ - (void)subscribeAttributeTemperatureUnitWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTemperatureUnitWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTemperatureUnitWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTemperatureUnitWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -12906,27 +12906,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -12941,27 +12941,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -12976,27 +12976,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -13011,27 +13011,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -13046,18 +13046,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -13330,10 +13330,10 @@ @implementation MTRBaseClusterPowerSourceConfiguration (Deprecated)
 - (void)readAttributeSourcesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSourcesWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSourcesWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                           params:(MTRSubscribeParams * _Nullable)params
@@ -13348,27 +13348,27 @@ - (void)subscribeAttributeSourcesWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSourcesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeSourcesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSourcesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -13383,27 +13383,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -13418,27 +13418,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -13453,27 +13453,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -13488,27 +13488,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -13523,18 +13523,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -14923,10 +14923,10 @@ @implementation MTRBaseClusterPowerSource (Deprecated)
 - (void)readAttributeStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStatusWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                          params:(MTRSubscribeParams * _Nullable)params
@@ -14941,27 +14941,27 @@ - (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStatusWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeStatusWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStatusWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOrderWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOrderWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOrderWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                         params:(MTRSubscribeParams * _Nullable)params
@@ -14976,27 +14976,27 @@ - (void)subscribeAttributeOrderWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOrderWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOrderWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOrderWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeDescriptionWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDescriptionWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -15011,27 +15011,27 @@ - (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDescriptionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeDescriptionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDescriptionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeWiredAssessedInputVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredAssessedInputVoltageWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeWiredAssessedInputVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                             params:(MTRSubscribeParams * _Nullable)params
@@ -15046,27 +15046,27 @@ - (void)subscribeAttributeWiredAssessedInputVoltageWithMinInterval:(NSNumber * _
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWiredAssessedInputVoltageWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWiredAssessedInputVoltageWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredAssessedInputVoltageWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWiredAssessedInputFrequencyWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredAssessedInputFrequencyWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeWiredAssessedInputFrequencyWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                               params:(MTRSubscribeParams * _Nullable)params
@@ -15081,27 +15081,27 @@ - (void)subscribeAttributeWiredAssessedInputFrequencyWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWiredAssessedInputFrequencyWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWiredAssessedInputFrequencyWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredAssessedInputFrequencyWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWiredCurrentTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredCurrentTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeWiredCurrentTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -15116,27 +15116,27 @@ - (void)subscribeAttributeWiredCurrentTypeWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWiredCurrentTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWiredCurrentTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredCurrentTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWiredAssessedCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredAssessedCurrentWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeWiredAssessedCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -15151,27 +15151,27 @@ - (void)subscribeAttributeWiredAssessedCurrentWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWiredAssessedCurrentWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWiredAssessedCurrentWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredAssessedCurrentWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWiredNominalVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredNominalVoltageWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeWiredNominalVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -15186,27 +15186,27 @@ - (void)subscribeAttributeWiredNominalVoltageWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWiredNominalVoltageWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWiredNominalVoltageWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredNominalVoltageWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWiredMaximumCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredMaximumCurrentWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeWiredMaximumCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -15221,27 +15221,27 @@ - (void)subscribeAttributeWiredMaximumCurrentWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWiredMaximumCurrentWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWiredMaximumCurrentWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredMaximumCurrentWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWiredPresentWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredPresentWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeWiredPresentWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -15256,27 +15256,27 @@ - (void)subscribeAttributeWiredPresentWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWiredPresentWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWiredPresentWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiredPresentWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeActiveWiredFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveWiredFaultsWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeActiveWiredFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -15291,27 +15291,27 @@ - (void)subscribeAttributeActiveWiredFaultsWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActiveWiredFaultsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                   }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeActiveWiredFaultsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveWiredFaultsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatVoltageWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatVoltageWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatVoltageWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -15326,27 +15326,27 @@ - (void)subscribeAttributeBatVoltageWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatVoltageWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatVoltageWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatVoltageWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatPercentRemainingWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatPercentRemainingWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatPercentRemainingWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -15361,27 +15361,27 @@ - (void)subscribeAttributeBatPercentRemainingWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatPercentRemainingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatPercentRemainingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatPercentRemainingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatTimeRemainingWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatTimeRemainingWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatTimeRemainingWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -15396,27 +15396,27 @@ - (void)subscribeAttributeBatTimeRemainingWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatTimeRemainingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatTimeRemainingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatTimeRemainingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatChargeLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatChargeLevelWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatChargeLevelWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -15431,27 +15431,27 @@ - (void)subscribeAttributeBatChargeLevelWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatChargeLevelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatChargeLevelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatChargeLevelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatReplacementNeededWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatReplacementNeededWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatReplacementNeededWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -15466,27 +15466,27 @@ - (void)subscribeAttributeBatReplacementNeededWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatReplacementNeededWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatReplacementNeededWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatReplacementNeededWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatReplaceabilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatReplaceabilityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatReplaceabilityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -15501,27 +15501,27 @@ - (void)subscribeAttributeBatReplaceabilityWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatReplaceabilityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatReplaceabilityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatReplaceabilityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatPresentWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatPresentWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatPresentWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -15536,27 +15536,27 @@ - (void)subscribeAttributeBatPresentWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatPresentWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatPresentWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatPresentWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeActiveBatFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveBatFaultsWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeActiveBatFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -15571,27 +15571,27 @@ - (void)subscribeAttributeActiveBatFaultsWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActiveBatFaultsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                 }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeActiveBatFaultsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveBatFaultsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                    }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatReplacementDescriptionWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatReplacementDescriptionWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatReplacementDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                             params:(MTRSubscribeParams * _Nullable)params
@@ -15606,27 +15606,27 @@ - (void)subscribeAttributeBatReplacementDescriptionWithMinInterval:(NSNumber * _
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatReplacementDescriptionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                           ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                           }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeBatReplacementDescriptionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatReplacementDescriptionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatCommonDesignationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatCommonDesignationWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatCommonDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -15641,27 +15641,27 @@ - (void)subscribeAttributeBatCommonDesignationWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatCommonDesignationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatCommonDesignationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatCommonDesignationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatANSIDesignationWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatANSIDesignationWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatANSIDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -15676,27 +15676,27 @@ - (void)subscribeAttributeBatANSIDesignationWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatANSIDesignationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                    }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeBatANSIDesignationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatANSIDesignationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                       }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatIECDesignationWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatIECDesignationWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatIECDesignationWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -15711,27 +15711,27 @@ - (void)subscribeAttributeBatIECDesignationWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatIECDesignationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                   }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeBatIECDesignationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatIECDesignationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                      }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatApprovedChemistryWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatApprovedChemistryWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatApprovedChemistryWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -15746,27 +15746,27 @@ - (void)subscribeAttributeBatApprovedChemistryWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatApprovedChemistryWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatApprovedChemistryWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatApprovedChemistryWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatCapacityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatCapacityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -15781,27 +15781,27 @@ - (void)subscribeAttributeBatCapacityWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatCapacityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatCapacityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatCapacityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatQuantityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatQuantityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatQuantityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -15816,27 +15816,27 @@ - (void)subscribeAttributeBatQuantityWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatQuantityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatQuantityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatQuantityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatChargeStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatChargeStateWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatChargeStateWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -15851,27 +15851,27 @@ - (void)subscribeAttributeBatChargeStateWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatChargeStateWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatChargeStateWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatChargeStateWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatTimeToFullChargeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatTimeToFullChargeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatTimeToFullChargeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -15886,27 +15886,27 @@ - (void)subscribeAttributeBatTimeToFullChargeWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatTimeToFullChargeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatTimeToFullChargeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatTimeToFullChargeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatFunctionalWhileChargingWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatFunctionalWhileChargingWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatFunctionalWhileChargingWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                              params:(MTRSubscribeParams * _Nullable)params
@@ -15921,27 +15921,27 @@ - (void)subscribeAttributeBatFunctionalWhileChargingWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatFunctionalWhileChargingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatFunctionalWhileChargingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatFunctionalWhileChargingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBatChargingCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatChargingCurrentWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBatChargingCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -15956,27 +15956,27 @@ - (void)subscribeAttributeBatChargingCurrentWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBatChargingCurrentWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBatChargingCurrentWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBatChargingCurrentWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeActiveBatChargeFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveBatChargeFaultsWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeActiveBatChargeFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -15991,27 +15991,27 @@ - (void)subscribeAttributeActiveBatChargeFaultsWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActiveBatChargeFaultsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                       }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeActiveBatChargeFaultsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveBatChargeFaultsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                          }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -16026,27 +16026,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -16061,27 +16061,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -16096,27 +16096,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -16131,27 +16131,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -16166,18 +16166,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -16867,26 +16867,26 @@ @implementation MTRBaseClusterGeneralCommissioning (Deprecated)
 - (void)armFailSafeWithParams:(MTRGeneralCommissioningClusterArmFailSafeParams *)params completionHandler:(void (^)(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self armFailSafeWithParams:params completion:
-                                           ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data, NSError * _Nullable error) {
-                                               // Cast is safe because subclass does not add any selectors.
-                                               completionHandler(static_cast<MTRGeneralCommissioningClusterArmFailSafeResponseParams *>(data), error);
-                                           }];
+            ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGeneralCommissioningClusterArmFailSafeResponseParams *>(data), error);
+            }];
 }
 - (void)setRegulatoryConfigWithParams:(MTRGeneralCommissioningClusterSetRegulatoryConfigParams *)params completionHandler:(void (^)(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self setRegulatoryConfigWithParams:params completion:
-                                                   ^(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                       // Cast is safe because subclass does not add any selectors.
-                                                       completionHandler(static_cast<MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams *>(data), error);
-                                                   }];
+            ^(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams *>(data), error);
+            }];
 }
 - (void)commissioningCompleteWithParams:(MTRGeneralCommissioningClusterCommissioningCompleteParams * _Nullable)params completionHandler:(void (^)(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self commissioningCompleteWithParams:params completion:
-                                                     ^(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                         // Cast is safe because subclass does not add any selectors.
-                                                         completionHandler(static_cast<MTRGeneralCommissioningClusterCommissioningCompleteResponseParams *>(data), error);
-                                                     }];
+            ^(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGeneralCommissioningClusterCommissioningCompleteResponseParams *>(data), error);
+            }];
 }
 - (void)commissioningCompleteWithCompletionHandler:(void (^)(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -16896,10 +16896,10 @@ - (void)commissioningCompleteWithCompletionHandler:(void (^)(MTRGeneralCommissio
 - (void)readAttributeBreadcrumbWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBreadcrumbWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeBreadcrumbWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -16922,27 +16922,27 @@ - (void)subscribeAttributeBreadcrumbWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBreadcrumbWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBreadcrumbWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBreadcrumbWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBasicCommissioningInfoWithCompletionHandler:(void (^)(MTRGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBasicCommissioningInfoWithCompletion:
-              ^(MTRGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<MTRGeneralCommissioningClusterBasicCommissioningInfo *>(value), error);
-              }];
+            ^(MTRGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGeneralCommissioningClusterBasicCommissioningInfo *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBasicCommissioningInfoWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -16957,27 +16957,27 @@ - (void)subscribeAttributeBasicCommissioningInfoWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBasicCommissioningInfoWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(MTRGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<MTRGeneralCommissioningClusterBasicCommissioningInfo *>(value), error);
-                                                                                                                                        }];
+            ^(MTRGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<MTRGeneralCommissioningClusterBasicCommissioningInfo *>(value), error);
+            }];
 }
 + (void)readAttributeBasicCommissioningInfoWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(MTRGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBasicCommissioningInfoWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(MTRGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<MTRGeneralCommissioningClusterBasicCommissioningInfo *>(value), error);
-                                                                                                                                           }];
+            ^(MTRGeneralCommissioningClusterBasicCommissioningInfo * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGeneralCommissioningClusterBasicCommissioningInfo *>(value), error);
+            }];
 }
 
 - (void)readAttributeRegulatoryConfigWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRegulatoryConfigWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRegulatoryConfigWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -16992,27 +16992,27 @@ - (void)subscribeAttributeRegulatoryConfigWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRegulatoryConfigWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRegulatoryConfigWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRegulatoryConfigWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLocationCapabilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocationCapabilityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLocationCapabilityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -17027,27 +17027,27 @@ - (void)subscribeAttributeLocationCapabilityWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLocationCapabilityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLocationCapabilityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocationCapabilityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSupportsConcurrentConnectionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportsConcurrentConnectionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSupportsConcurrentConnectionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                params:(MTRSubscribeParams * _Nullable)params
@@ -17062,27 +17062,27 @@ - (void)subscribeAttributeSupportsConcurrentConnectionWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSupportsConcurrentConnectionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSupportsConcurrentConnectionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportsConcurrentConnectionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -17097,27 +17097,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -17132,27 +17132,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -17167,27 +17167,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -17202,27 +17202,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -17237,18 +17237,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -18082,59 +18082,59 @@ @implementation MTRBaseClusterNetworkCommissioning (Deprecated)
 - (void)scanNetworksWithParams:(MTRNetworkCommissioningClusterScanNetworksParams * _Nullable)params completionHandler:(void (^)(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self scanNetworksWithParams:params completion:
-                                            ^(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                // Cast is safe because subclass does not add any selectors.
-                                                completionHandler(static_cast<MTRNetworkCommissioningClusterScanNetworksResponseParams *>(data), error);
-                                            }];
+            ^(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterScanNetworksResponseParams *>(data), error);
+            }];
 }
 - (void)addOrUpdateWiFiNetworkWithParams:(MTRNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams *)params completionHandler:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self addOrUpdateWiFiNetworkWithParams:params completion:
-                                                      ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                          // Cast is safe because subclass does not add any selectors.
-                                                          completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
-                                                      }];
+            ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
+            }];
 }
 - (void)addOrUpdateThreadNetworkWithParams:(MTRNetworkCommissioningClusterAddOrUpdateThreadNetworkParams *)params completionHandler:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self addOrUpdateThreadNetworkWithParams:params completion:
-                                                        ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                            // Cast is safe because subclass does not add any selectors.
-                                                            completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
-                                                        }];
+            ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
+            }];
 }
 - (void)removeNetworkWithParams:(MTRNetworkCommissioningClusterRemoveNetworkParams *)params completionHandler:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self removeNetworkWithParams:params completion:
-                                             ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                 // Cast is safe because subclass does not add any selectors.
-                                                 completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
-                                             }];
+            ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
+            }];
 }
 - (void)connectNetworkWithParams:(MTRNetworkCommissioningClusterConnectNetworkParams *)params completionHandler:(void (^)(MTRNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self connectNetworkWithParams:params completion:
-                                              ^(MTRNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                  // Cast is safe because subclass does not add any selectors.
-                                                  completionHandler(static_cast<MTRNetworkCommissioningClusterConnectNetworkResponseParams *>(data), error);
-                                              }];
+            ^(MTRNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterConnectNetworkResponseParams *>(data), error);
+            }];
 }
 - (void)reorderNetworkWithParams:(MTRNetworkCommissioningClusterReorderNetworkParams *)params completionHandler:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self reorderNetworkWithParams:params completion:
-                                              ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                  // Cast is safe because subclass does not add any selectors.
-                                                  completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
-                                              }];
+            ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
+            }];
 }
 
 - (void)readAttributeMaxNetworksWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxNetworksWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxNetworksWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -18149,27 +18149,27 @@ - (void)subscribeAttributeMaxNetworksWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxNetworksWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxNetworksWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxNetworksWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNetworksWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNetworksWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNetworksWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -18184,27 +18184,27 @@ - (void)subscribeAttributeNetworksWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNetworksWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                          }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeNetworksWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNetworksWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                             }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeScanMaxTimeSecondsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeScanMaxTimeSecondsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeScanMaxTimeSecondsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -18219,27 +18219,27 @@ - (void)subscribeAttributeScanMaxTimeSecondsWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeScanMaxTimeSecondsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeScanMaxTimeSecondsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeScanMaxTimeSecondsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeConnectMaxTimeSecondsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeConnectMaxTimeSecondsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeConnectMaxTimeSecondsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -18254,27 +18254,27 @@ - (void)subscribeAttributeConnectMaxTimeSecondsWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeConnectMaxTimeSecondsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeConnectMaxTimeSecondsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeConnectMaxTimeSecondsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInterfaceEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInterfaceEnabledWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInterfaceEnabledWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -18297,27 +18297,27 @@ - (void)subscribeAttributeInterfaceEnabledWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInterfaceEnabledWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInterfaceEnabledWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInterfaceEnabledWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLastNetworkingStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLastNetworkingStatusWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLastNetworkingStatusWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -18332,27 +18332,27 @@ - (void)subscribeAttributeLastNetworkingStatusWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLastNetworkingStatusWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLastNetworkingStatusWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLastNetworkingStatusWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLastNetworkIDWithCompletionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLastNetworkIDWithCompletion:
-              ^(NSData * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSData *>(value), error);
-              }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLastNetworkIDWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -18367,27 +18367,27 @@ - (void)subscribeAttributeLastNetworkIDWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLastNetworkIDWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSData *>(value), error);
-                                                                                                                               }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSData *>(value), error);
+            }];
 }
 + (void)readAttributeLastNetworkIDWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLastNetworkIDWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSData *>(value), error);
-                                                                                                                                  }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 
 - (void)readAttributeLastConnectErrorValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLastConnectErrorValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLastConnectErrorValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -18402,27 +18402,27 @@ - (void)subscribeAttributeLastConnectErrorValueWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLastConnectErrorValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLastConnectErrorValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLastConnectErrorValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -18437,27 +18437,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -18472,27 +18472,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -18507,27 +18507,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -18542,27 +18542,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -18577,18 +18577,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -18850,19 +18850,19 @@ @implementation MTRBaseClusterDiagnosticLogs (Deprecated)
 - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsRequestParams *)params completionHandler:(void (^)(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self retrieveLogsRequestWithParams:params completion:
-                                                   ^(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                       // Cast is safe because subclass does not add any selectors.
-                                                       completionHandler(static_cast<MTRDiagnosticLogsClusterRetrieveLogsResponseParams *>(data), error);
-                                                   }];
+            ^(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDiagnosticLogsClusterRetrieveLogsResponseParams *>(data), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -18877,27 +18877,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -18912,27 +18912,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -18947,27 +18947,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -18982,27 +18982,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -19017,18 +19017,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -19666,16 +19666,16 @@ @implementation MTRBaseClusterGeneralDiagnostics (Deprecated)
 - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTriggerParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self testEventTriggerWithParams:params completion:
-                                                completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeNetworkInterfacesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNetworkInterfacesWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNetworkInterfacesWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -19690,27 +19690,27 @@ - (void)subscribeAttributeNetworkInterfacesWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNetworkInterfacesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                   }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeNetworkInterfacesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNetworkInterfacesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeRebootCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRebootCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRebootCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -19725,27 +19725,27 @@ - (void)subscribeAttributeRebootCountWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRebootCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRebootCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRebootCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUpTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUpTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeUpTimeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                          params:(MTRSubscribeParams * _Nullable)params
@@ -19760,27 +19760,27 @@ - (void)subscribeAttributeUpTimeWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUpTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUpTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUpTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTotalOperationalHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTotalOperationalHoursWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTotalOperationalHoursWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -19795,27 +19795,27 @@ - (void)subscribeAttributeTotalOperationalHoursWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTotalOperationalHoursWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTotalOperationalHoursWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTotalOperationalHoursWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBootReasonsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBootReasonWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBootReasonsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -19830,27 +19830,27 @@ - (void)subscribeAttributeBootReasonsWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBootReasonWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBootReasonsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBootReasonWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeActiveHardwareFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveHardwareFaultsWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeActiveHardwareFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -19865,27 +19865,27 @@ - (void)subscribeAttributeActiveHardwareFaultsWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActiveHardwareFaultsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeActiveHardwareFaultsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveHardwareFaultsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeActiveRadioFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveRadioFaultsWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeActiveRadioFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -19900,27 +19900,27 @@ - (void)subscribeAttributeActiveRadioFaultsWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActiveRadioFaultsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                   }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeActiveRadioFaultsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveRadioFaultsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeActiveNetworkFaultsWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveNetworkFaultsWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeActiveNetworkFaultsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -19935,27 +19935,27 @@ - (void)subscribeAttributeActiveNetworkFaultsWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActiveNetworkFaultsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeActiveNetworkFaultsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveNetworkFaultsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeTestEventTriggersEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTestEventTriggersEnabledWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTestEventTriggersEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                            params:(MTRSubscribeParams * _Nullable)params
@@ -19970,27 +19970,27 @@ - (void)subscribeAttributeTestEventTriggersEnabledWithMinInterval:(NSNumber * _N
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTestEventTriggersEnabledWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTestEventTriggersEnabledWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTestEventTriggersEnabledWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -20005,27 +20005,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -20040,27 +20040,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -20075,27 +20075,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -20110,27 +20110,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -20145,18 +20145,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -20566,7 +20566,7 @@ @implementation MTRBaseClusterSoftwareDiagnostics (Deprecated)
 - (void)resetWatermarksWithParams:(MTRSoftwareDiagnosticsClusterResetWatermarksParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self resetWatermarksWithParams:params completion:
-                                               completionHandler];
+            completionHandler];
 }
 - (void)resetWatermarksWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -20576,10 +20576,10 @@ - (void)resetWatermarksWithCompletionHandler:(MTRStatusCompletion)completionHand
 - (void)readAttributeThreadMetricsWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeThreadMetricsWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeThreadMetricsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -20594,27 +20594,27 @@ - (void)subscribeAttributeThreadMetricsWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeThreadMetricsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeThreadMetricsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeThreadMetricsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentHeapFreeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentHeapFreeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentHeapFreeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -20629,27 +20629,27 @@ - (void)subscribeAttributeCurrentHeapFreeWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentHeapFreeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentHeapFreeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentHeapFreeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentHeapUsedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentHeapUsedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentHeapUsedWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -20664,27 +20664,27 @@ - (void)subscribeAttributeCurrentHeapUsedWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentHeapUsedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentHeapUsedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentHeapUsedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentHeapHighWatermarkWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentHeapHighWatermarkWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentHeapHighWatermarkWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                            params:(MTRSubscribeParams * _Nullable)params
@@ -20699,27 +20699,27 @@ - (void)subscribeAttributeCurrentHeapHighWatermarkWithMinInterval:(NSNumber * _N
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentHeapHighWatermarkWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentHeapHighWatermarkWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentHeapHighWatermarkWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -20734,27 +20734,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -20769,27 +20769,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -20804,27 +20804,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -20839,27 +20839,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -20874,18 +20874,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -23419,7 +23419,7 @@ @implementation MTRBaseClusterThreadNetworkDiagnostics (Deprecated)
 - (void)resetCountsWithParams:(MTRThreadNetworkDiagnosticsClusterResetCountsParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self resetCountsWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 - (void)resetCountsWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -23429,10 +23429,10 @@ - (void)resetCountsWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)readAttributeChannelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeChannelWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeChannelWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                           params:(MTRSubscribeParams * _Nullable)params
@@ -23447,27 +23447,27 @@ - (void)subscribeAttributeChannelWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeChannelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeChannelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeChannelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRoutingRoleWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRoutingRoleWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRoutingRoleWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -23482,27 +23482,27 @@ - (void)subscribeAttributeRoutingRoleWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRoutingRoleWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRoutingRoleWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRoutingRoleWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNetworkNameWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNetworkNameWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNetworkNameWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -23517,27 +23517,27 @@ - (void)subscribeAttributeNetworkNameWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNetworkNameWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeNetworkNameWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNetworkNameWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributePanIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePanIdWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePanIdWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                         params:(MTRSubscribeParams * _Nullable)params
@@ -23552,27 +23552,27 @@ - (void)subscribeAttributePanIdWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePanIdWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePanIdWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePanIdWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeExtendedPanIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeExtendedPanIdWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeExtendedPanIdWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -23587,27 +23587,27 @@ - (void)subscribeAttributeExtendedPanIdWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeExtendedPanIdWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeExtendedPanIdWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeExtendedPanIdWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMeshLocalPrefixWithCompletionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeshLocalPrefixWithCompletion:
-              ^(NSData * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSData *>(value), error);
-              }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMeshLocalPrefixWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -23622,27 +23622,27 @@ - (void)subscribeAttributeMeshLocalPrefixWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMeshLocalPrefixWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSData *>(value), error);
-                                                                                                                                 }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSData *>(value), error);
+            }];
 }
 + (void)readAttributeMeshLocalPrefixWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeshLocalPrefixWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSData *>(value), error);
-                                                                                                                                    }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 
 - (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOverrunCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -23657,27 +23657,27 @@ - (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOverrunCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOverrunCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOverrunCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNeighborTableListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNeighborTableWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNeighborTableListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -23692,27 +23692,27 @@ - (void)subscribeAttributeNeighborTableListWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNeighborTableWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeNeighborTableListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNeighborTableWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeRouteTableListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRouteTableWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRouteTableListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -23727,27 +23727,27 @@ - (void)subscribeAttributeRouteTableListWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRouteTableWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeRouteTableListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRouteTableWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributePartitionIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePartitionIdWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePartitionIdWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -23762,27 +23762,27 @@ - (void)subscribeAttributePartitionIdWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePartitionIdWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePartitionIdWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePartitionIdWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWeightingWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWeightingWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeWeightingWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -23797,27 +23797,27 @@ - (void)subscribeAttributeWeightingWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWeightingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWeightingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWeightingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeDataVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDataVersionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -23832,27 +23832,27 @@ - (void)subscribeAttributeDataVersionWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDataVersionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeDataVersionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDataVersionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeStableDataVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStableDataVersionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeStableDataVersionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -23867,27 +23867,27 @@ - (void)subscribeAttributeStableDataVersionWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStableDataVersionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeStableDataVersionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStableDataVersionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLeaderRouterIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLeaderRouterIdWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLeaderRouterIdWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -23902,27 +23902,27 @@ - (void)subscribeAttributeLeaderRouterIdWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLeaderRouterIdWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLeaderRouterIdWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLeaderRouterIdWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeDetachedRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDetachedRoleCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeDetachedRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -23937,27 +23937,27 @@ - (void)subscribeAttributeDetachedRoleCountWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDetachedRoleCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeDetachedRoleCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDetachedRoleCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeChildRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeChildRoleCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeChildRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -23972,27 +23972,27 @@ - (void)subscribeAttributeChildRoleCountWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeChildRoleCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeChildRoleCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeChildRoleCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRouterRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRouterRoleCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRouterRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -24007,27 +24007,27 @@ - (void)subscribeAttributeRouterRoleCountWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRouterRoleCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRouterRoleCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRouterRoleCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLeaderRoleCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLeaderRoleCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLeaderRoleCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -24042,27 +24042,27 @@ - (void)subscribeAttributeLeaderRoleCountWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLeaderRoleCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLeaderRoleCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLeaderRoleCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttachAttemptCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttachAttemptCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttachAttemptCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -24077,27 +24077,27 @@ - (void)subscribeAttributeAttachAttemptCountWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttachAttemptCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeAttachAttemptCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttachAttemptCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePartitionIdChangeCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePartitionIdChangeCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePartitionIdChangeCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -24112,27 +24112,27 @@ - (void)subscribeAttributePartitionIdChangeCountWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePartitionIdChangeCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePartitionIdChangeCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePartitionIdChangeCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBetterPartitionAttachAttemptCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBetterPartitionAttachAttemptCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBetterPartitionAttachAttemptCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -24147,27 +24147,27 @@ - (void)subscribeAttributeBetterPartitionAttachAttemptCountWithMinInterval:(NSNu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBetterPartitionAttachAttemptCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBetterPartitionAttachAttemptCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBetterPartitionAttachAttemptCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeParentChangeCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeParentChangeCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeParentChangeCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -24182,27 +24182,27 @@ - (void)subscribeAttributeParentChangeCountWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeParentChangeCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeParentChangeCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeParentChangeCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxTotalCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxTotalCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxTotalCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -24217,27 +24217,27 @@ - (void)subscribeAttributeTxTotalCountWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxTotalCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxTotalCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxTotalCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxUnicastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxUnicastCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxUnicastCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -24252,27 +24252,27 @@ - (void)subscribeAttributeTxUnicastCountWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxUnicastCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxUnicastCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxUnicastCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxBroadcastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxBroadcastCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -24287,27 +24287,27 @@ - (void)subscribeAttributeTxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxBroadcastCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxBroadcastCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxBroadcastCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxAckRequestedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxAckRequestedCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxAckRequestedCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -24322,27 +24322,27 @@ - (void)subscribeAttributeTxAckRequestedCountWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxAckRequestedCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxAckRequestedCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxAckRequestedCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxAckedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxAckedCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxAckedCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -24357,27 +24357,27 @@ - (void)subscribeAttributeTxAckedCountWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxAckedCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxAckedCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxAckedCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxNoAckRequestedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxNoAckRequestedCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxNoAckRequestedCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -24392,27 +24392,27 @@ - (void)subscribeAttributeTxNoAckRequestedCountWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxNoAckRequestedCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxNoAckRequestedCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxNoAckRequestedCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxDataCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxDataCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxDataCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -24427,27 +24427,27 @@ - (void)subscribeAttributeTxDataCountWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxDataCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxDataCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxDataCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxDataPollCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxDataPollCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxDataPollCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -24462,27 +24462,27 @@ - (void)subscribeAttributeTxDataPollCountWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxDataPollCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxDataPollCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxDataPollCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxBeaconCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxBeaconCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -24497,27 +24497,27 @@ - (void)subscribeAttributeTxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxBeaconCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxBeaconCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxBeaconCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxBeaconRequestCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxBeaconRequestCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -24532,27 +24532,27 @@ - (void)subscribeAttributeTxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxBeaconRequestCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxBeaconRequestCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxBeaconRequestCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxOtherCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxOtherCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -24567,27 +24567,27 @@ - (void)subscribeAttributeTxOtherCountWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxOtherCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxOtherCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxOtherCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxRetryCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxRetryCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxRetryCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -24602,27 +24602,27 @@ - (void)subscribeAttributeTxRetryCountWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxRetryCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxRetryCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxRetryCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxDirectMaxRetryExpiryCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxDirectMaxRetryExpiryCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxDirectMaxRetryExpiryCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                               params:(MTRSubscribeParams * _Nullable)params
@@ -24637,27 +24637,27 @@ - (void)subscribeAttributeTxDirectMaxRetryExpiryCountWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxDirectMaxRetryExpiryCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxDirectMaxRetryExpiryCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxDirectMaxRetryExpiryCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxIndirectMaxRetryExpiryCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxIndirectMaxRetryExpiryCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxIndirectMaxRetryExpiryCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -24672,27 +24672,27 @@ - (void)subscribeAttributeTxIndirectMaxRetryExpiryCountWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxIndirectMaxRetryExpiryCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxIndirectMaxRetryExpiryCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxIndirectMaxRetryExpiryCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxErrCcaCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxErrCcaCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxErrCcaCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -24707,27 +24707,27 @@ - (void)subscribeAttributeTxErrCcaCountWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxErrCcaCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxErrCcaCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxErrCcaCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxErrAbortCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxErrAbortCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxErrAbortCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -24742,27 +24742,27 @@ - (void)subscribeAttributeTxErrAbortCountWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxErrAbortCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxErrAbortCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxErrAbortCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxErrBusyChannelCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxErrBusyChannelCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxErrBusyChannelCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -24777,27 +24777,27 @@ - (void)subscribeAttributeTxErrBusyChannelCountWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxErrBusyChannelCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxErrBusyChannelCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxErrBusyChannelCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxTotalCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxTotalCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxTotalCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -24812,27 +24812,27 @@ - (void)subscribeAttributeRxTotalCountWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxTotalCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxTotalCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxTotalCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxUnicastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxUnicastCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxUnicastCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -24847,27 +24847,27 @@ - (void)subscribeAttributeRxUnicastCountWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxUnicastCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxUnicastCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxUnicastCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxBroadcastCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxBroadcastCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -24882,27 +24882,27 @@ - (void)subscribeAttributeRxBroadcastCountWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxBroadcastCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxBroadcastCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxBroadcastCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxDataCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxDataCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxDataCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -24917,27 +24917,27 @@ - (void)subscribeAttributeRxDataCountWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxDataCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxDataCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxDataCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxDataPollCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxDataPollCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxDataPollCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -24952,27 +24952,27 @@ - (void)subscribeAttributeRxDataPollCountWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxDataPollCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxDataPollCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxDataPollCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxBeaconCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxBeaconCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -24987,27 +24987,27 @@ - (void)subscribeAttributeRxBeaconCountWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxBeaconCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxBeaconCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxBeaconCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxBeaconRequestCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxBeaconRequestCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -25022,27 +25022,27 @@ - (void)subscribeAttributeRxBeaconRequestCountWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxBeaconRequestCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxBeaconRequestCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxBeaconRequestCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxOtherCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxOtherCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -25057,27 +25057,27 @@ - (void)subscribeAttributeRxOtherCountWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxOtherCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxOtherCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxOtherCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxAddressFilteredCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxAddressFilteredCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxAddressFilteredCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -25092,27 +25092,27 @@ - (void)subscribeAttributeRxAddressFilteredCountWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxAddressFilteredCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxAddressFilteredCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxAddressFilteredCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxDestAddrFilteredCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxDestAddrFilteredCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxDestAddrFilteredCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                           params:(MTRSubscribeParams * _Nullable)params
@@ -25127,27 +25127,27 @@ - (void)subscribeAttributeRxDestAddrFilteredCountWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxDestAddrFilteredCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxDestAddrFilteredCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxDestAddrFilteredCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxDuplicatedCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxDuplicatedCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxDuplicatedCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -25162,27 +25162,27 @@ - (void)subscribeAttributeRxDuplicatedCountWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxDuplicatedCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxDuplicatedCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxDuplicatedCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxErrNoFrameCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrNoFrameCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxErrNoFrameCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -25197,27 +25197,27 @@ - (void)subscribeAttributeRxErrNoFrameCountWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxErrNoFrameCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxErrNoFrameCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrNoFrameCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxErrUnknownNeighborCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrUnknownNeighborCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxErrUnknownNeighborCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                             params:(MTRSubscribeParams * _Nullable)params
@@ -25232,27 +25232,27 @@ - (void)subscribeAttributeRxErrUnknownNeighborCountWithMinInterval:(NSNumber * _
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxErrUnknownNeighborCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxErrUnknownNeighborCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrUnknownNeighborCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxErrInvalidSrcAddrCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrInvalidSrcAddrCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxErrInvalidSrcAddrCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                            params:(MTRSubscribeParams * _Nullable)params
@@ -25267,27 +25267,27 @@ - (void)subscribeAttributeRxErrInvalidSrcAddrCountWithMinInterval:(NSNumber * _N
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxErrInvalidSrcAddrCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxErrInvalidSrcAddrCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrInvalidSrcAddrCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxErrSecCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrSecCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxErrSecCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -25302,27 +25302,27 @@ - (void)subscribeAttributeRxErrSecCountWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxErrSecCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxErrSecCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrSecCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxErrFcsCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrFcsCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxErrFcsCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -25337,27 +25337,27 @@ - (void)subscribeAttributeRxErrFcsCountWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxErrFcsCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxErrFcsCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrFcsCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRxErrOtherCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrOtherCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRxErrOtherCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -25372,27 +25372,27 @@ - (void)subscribeAttributeRxErrOtherCountWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRxErrOtherCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRxErrOtherCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRxErrOtherCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeActiveTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveTimestampWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeActiveTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -25407,27 +25407,27 @@ - (void)subscribeAttributeActiveTimestampWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActiveTimestampWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeActiveTimestampWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveTimestampWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePendingTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePendingTimestampWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePendingTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -25442,27 +25442,27 @@ - (void)subscribeAttributePendingTimestampWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePendingTimestampWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePendingTimestampWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePendingTimestampWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDelayWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeDelayWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                         params:(MTRSubscribeParams * _Nullable)params
@@ -25477,27 +25477,27 @@ - (void)subscribeAttributeDelayWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDelayWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeDelayWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDelayWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSecurityPolicyWithCompletionHandler:(void (^)(MTRThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSecurityPolicyWithCompletion:
-              ^(MTRThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<MTRThreadNetworkDiagnosticsClusterSecurityPolicy *>(value), error);
-              }];
+            ^(MTRThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRThreadNetworkDiagnosticsClusterSecurityPolicy *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSecurityPolicyWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -25512,27 +25512,27 @@ - (void)subscribeAttributeSecurityPolicyWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSecurityPolicyWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(MTRThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<MTRThreadNetworkDiagnosticsClusterSecurityPolicy *>(value), error);
-                                                                                                                                }];
+            ^(MTRThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<MTRThreadNetworkDiagnosticsClusterSecurityPolicy *>(value), error);
+            }];
 }
 + (void)readAttributeSecurityPolicyWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(MTRThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSecurityPolicyWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(MTRThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<MTRThreadNetworkDiagnosticsClusterSecurityPolicy *>(value), error);
-                                                                                                                                   }];
+            ^(MTRThreadNetworkDiagnosticsClusterSecurityPolicy * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRThreadNetworkDiagnosticsClusterSecurityPolicy *>(value), error);
+            }];
 }
 
 - (void)readAttributeChannelPage0MaskWithCompletionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeChannelPage0MaskWithCompletion:
-              ^(NSData * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSData *>(value), error);
-              }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 - (void)subscribeAttributeChannelPage0MaskWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -25547,27 +25547,27 @@ - (void)subscribeAttributeChannelPage0MaskWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeChannelPage0MaskWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSData *>(value), error);
-                                                                                                                                  }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSData *>(value), error);
+            }];
 }
 + (void)readAttributeChannelPage0MaskWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeChannelPage0MaskWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSData *>(value), error);
-                                                                                                                                     }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 
 - (void)readAttributeOperationalDatasetComponentsWithCompletionHandler:(void (^)(MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOperationalDatasetComponentsWithCompletion:
-              ^(MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents *>(value), error);
-              }];
+            ^(MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                params:(MTRSubscribeParams * _Nullable)params
@@ -25582,27 +25582,27 @@ - (void)subscribeAttributeOperationalDatasetComponentsWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOperationalDatasetComponentsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                              ^(MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  reportHandler(static_cast<MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents *>(value), error);
-                                                                                                                                              }];
+            ^(MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents *>(value), error);
+            }];
 }
 + (void)readAttributeOperationalDatasetComponentsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOperationalDatasetComponentsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                 ^(MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     completionHandler(static_cast<MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents *>(value), error);
-                                                                                                                                                 }];
+            ^(MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents *>(value), error);
+            }];
 }
 
 - (void)readAttributeActiveNetworkFaultsListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveNetworkFaultsListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeActiveNetworkFaultsListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                           params:(MTRSubscribeParams * _Nullable)params
@@ -25617,27 +25617,27 @@ - (void)subscribeAttributeActiveNetworkFaultsListWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActiveNetworkFaultsListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeActiveNetworkFaultsListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActiveNetworkFaultsListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -25652,27 +25652,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -25687,27 +25687,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -25722,27 +25722,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -25757,27 +25757,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -25792,18 +25792,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -26537,7 +26537,7 @@ @implementation MTRBaseClusterWiFiNetworkDiagnostics (Deprecated)
 - (void)resetCountsWithParams:(MTRWiFiNetworkDiagnosticsClusterResetCountsParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self resetCountsWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 - (void)resetCountsWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -26547,10 +26547,10 @@ - (void)resetCountsWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)readAttributeBssidWithCompletionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBSSIDWithCompletion:
-              ^(NSData * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSData *>(value), error);
-              }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBssidWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                         params:(MTRSubscribeParams * _Nullable)params
@@ -26565,27 +26565,27 @@ - (void)subscribeAttributeBssidWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBSSIDWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                       ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                           reportHandler(static_cast<NSData *>(value), error);
-                                                                                                                       }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSData *>(value), error);
+            }];
 }
 + (void)readAttributeBssidWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBSSIDWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                          ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              completionHandler(static_cast<NSData *>(value), error);
-                                                                                                                          }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 
 - (void)readAttributeSecurityTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSecurityTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSecurityTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -26600,27 +26600,27 @@ - (void)subscribeAttributeSecurityTypeWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSecurityTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSecurityTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSecurityTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWiFiVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiFiVersionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeWiFiVersionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -26635,27 +26635,27 @@ - (void)subscribeAttributeWiFiVersionWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWiFiVersionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWiFiVersionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWiFiVersionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeChannelNumberWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeChannelNumberWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeChannelNumberWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -26670,27 +26670,27 @@ - (void)subscribeAttributeChannelNumberWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeChannelNumberWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeChannelNumberWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeChannelNumberWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRssiWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRSSIWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRssiWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                        params:(MTRSubscribeParams * _Nullable)params
@@ -26705,27 +26705,27 @@ - (void)subscribeAttributeRssiWithMinInterval:(NSNumber * _Nonnull)minInterval m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRSSIWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRssiWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRSSIWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBeaconLostCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBeaconLostCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBeaconLostCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -26740,27 +26740,27 @@ - (void)subscribeAttributeBeaconLostCountWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBeaconLostCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBeaconLostCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBeaconLostCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBeaconRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBeaconRxCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBeaconRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -26775,27 +26775,27 @@ - (void)subscribeAttributeBeaconRxCountWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBeaconRxCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBeaconRxCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBeaconRxCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePacketMulticastRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketMulticastRxCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePacketMulticastRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -26810,27 +26810,27 @@ - (void)subscribeAttributePacketMulticastRxCountWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePacketMulticastRxCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePacketMulticastRxCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketMulticastRxCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePacketMulticastTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketMulticastTxCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePacketMulticastTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -26845,27 +26845,27 @@ - (void)subscribeAttributePacketMulticastTxCountWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePacketMulticastTxCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePacketMulticastTxCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketMulticastTxCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePacketUnicastRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketUnicastRxCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePacketUnicastRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -26880,27 +26880,27 @@ - (void)subscribeAttributePacketUnicastRxCountWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePacketUnicastRxCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePacketUnicastRxCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketUnicastRxCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePacketUnicastTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketUnicastTxCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePacketUnicastTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -26915,27 +26915,27 @@ - (void)subscribeAttributePacketUnicastTxCountWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePacketUnicastTxCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePacketUnicastTxCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketUnicastTxCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentMaxRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentMaxRateWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentMaxRateWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -26950,27 +26950,27 @@ - (void)subscribeAttributeCurrentMaxRateWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentMaxRateWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentMaxRateWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentMaxRateWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOverrunCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -26985,27 +26985,27 @@ - (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOverrunCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOverrunCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOverrunCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -27020,27 +27020,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -27055,27 +27055,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -27090,27 +27090,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -27125,27 +27125,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -27160,18 +27160,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -27761,7 +27761,7 @@ @implementation MTRBaseClusterEthernetNetworkDiagnostics (Deprecated)
 - (void)resetCountsWithParams:(MTREthernetNetworkDiagnosticsClusterResetCountsParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self resetCountsWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 - (void)resetCountsWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -27771,10 +27771,10 @@ - (void)resetCountsWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)readAttributePHYRateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePHYRateWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePHYRateWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                           params:(MTRSubscribeParams * _Nullable)params
@@ -27789,27 +27789,27 @@ - (void)subscribeAttributePHYRateWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePHYRateWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePHYRateWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePHYRateWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeFullDuplexWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFullDuplexWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFullDuplexWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -27824,27 +27824,27 @@ - (void)subscribeAttributeFullDuplexWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFullDuplexWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFullDuplexWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFullDuplexWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePacketRxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketRxCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePacketRxCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -27859,27 +27859,27 @@ - (void)subscribeAttributePacketRxCountWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePacketRxCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePacketRxCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketRxCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePacketTxCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketTxCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePacketTxCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -27894,27 +27894,27 @@ - (void)subscribeAttributePacketTxCountWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePacketTxCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePacketTxCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePacketTxCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTxErrCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxErrCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTxErrCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -27929,27 +27929,27 @@ - (void)subscribeAttributeTxErrCountWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTxErrCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTxErrCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTxErrCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCollisionCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCollisionCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCollisionCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -27964,27 +27964,27 @@ - (void)subscribeAttributeCollisionCountWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCollisionCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCollisionCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCollisionCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOverrunCountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOverrunCountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -27999,27 +27999,27 @@ - (void)subscribeAttributeOverrunCountWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOverrunCountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOverrunCountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOverrunCountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCarrierDetectWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCarrierDetectWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCarrierDetectWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -28034,27 +28034,27 @@ - (void)subscribeAttributeCarrierDetectWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCarrierDetectWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCarrierDetectWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCarrierDetectWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTimeSinceResetWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTimeSinceResetWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTimeSinceResetWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -28069,27 +28069,27 @@ - (void)subscribeAttributeTimeSinceResetWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTimeSinceResetWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTimeSinceResetWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTimeSinceResetWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -28104,27 +28104,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -28139,27 +28139,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -28174,27 +28174,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -28209,27 +28209,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -28244,18 +28244,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -29969,10 +29969,10 @@ @implementation MTRBaseClusterBridgedDeviceBasic (Deprecated)
 - (void)readAttributeVendorNameWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorNameWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -29987,27 +29987,27 @@ - (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeVendorNameWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                            }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeVendorNameWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorNameWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                               }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeVendorIDWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorIDWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -30022,27 +30022,27 @@ - (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeVendorIDWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeVendorIDWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorIDWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeProductNameWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductNameWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeProductNameWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -30057,27 +30057,27 @@ - (void)subscribeAttributeProductNameWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeProductNameWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeProductNameWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductNameWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeNodeLabelWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNodeLabelWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)writeAttributeNodeLabelWithValue:(NSString * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -30100,27 +30100,27 @@ - (void)subscribeAttributeNodeLabelWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNodeLabelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                           }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeNodeLabelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNodeLabelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeHardwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHardwareVersionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeHardwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -30135,27 +30135,27 @@ - (void)subscribeAttributeHardwareVersionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeHardwareVersionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeHardwareVersionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHardwareVersionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeHardwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHardwareVersionStringWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeHardwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -30170,27 +30170,27 @@ - (void)subscribeAttributeHardwareVersionStringWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeHardwareVersionStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                       }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeHardwareVersionStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHardwareVersionStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                          }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeSoftwareVersionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSoftwareVersionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSoftwareVersionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -30205,27 +30205,27 @@ - (void)subscribeAttributeSoftwareVersionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSoftwareVersionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSoftwareVersionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSoftwareVersionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSoftwareVersionStringWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSoftwareVersionStringWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSoftwareVersionStringWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -30240,27 +30240,27 @@ - (void)subscribeAttributeSoftwareVersionStringWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSoftwareVersionStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                       }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeSoftwareVersionStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSoftwareVersionStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                          }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeManufacturingDateWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeManufacturingDateWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeManufacturingDateWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -30275,27 +30275,27 @@ - (void)subscribeAttributeManufacturingDateWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeManufacturingDateWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                   }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeManufacturingDateWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeManufacturingDateWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                      }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributePartNumberWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePartNumberWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributePartNumberWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -30310,27 +30310,27 @@ - (void)subscribeAttributePartNumberWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePartNumberWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                            }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributePartNumberWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePartNumberWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                               }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeProductURLWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductURLWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeProductURLWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -30345,27 +30345,27 @@ - (void)subscribeAttributeProductURLWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeProductURLWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                            }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeProductURLWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductURLWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                               }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeProductLabelWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductLabelWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeProductLabelWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -30380,27 +30380,27 @@ - (void)subscribeAttributeProductLabelWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeProductLabelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeProductLabelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductLabelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                 }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeSerialNumberWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSerialNumberWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSerialNumberWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -30415,27 +30415,27 @@ - (void)subscribeAttributeSerialNumberWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSerialNumberWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeSerialNumberWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSerialNumberWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                 }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeReachableWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeReachableWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeReachableWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -30450,27 +30450,27 @@ - (void)subscribeAttributeReachableWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeReachableWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeReachableWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeReachableWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUniqueIDWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUniqueIDWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeUniqueIDWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -30485,27 +30485,27 @@ - (void)subscribeAttributeUniqueIDWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUniqueIDWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                          }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeUniqueIDWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUniqueIDWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -30520,27 +30520,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -30555,27 +30555,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -30590,27 +30590,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -30625,27 +30625,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -30660,18 +30660,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -31016,10 +31016,10 @@ @implementation MTRBaseClusterSwitch (Deprecated)
 - (void)readAttributeNumberOfPositionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfPositionsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfPositionsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -31034,27 +31034,27 @@ - (void)subscribeAttributeNumberOfPositionsWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfPositionsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfPositionsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfPositionsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentPositionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -31069,27 +31069,27 @@ - (void)subscribeAttributeCurrentPositionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentPositionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentPositionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMultiPressMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMultiPressMaxWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMultiPressMaxWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -31104,27 +31104,27 @@ - (void)subscribeAttributeMultiPressMaxWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMultiPressMaxWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMultiPressMaxWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMultiPressMaxWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -31139,27 +31139,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -31174,27 +31174,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -31209,27 +31209,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -31244,27 +31244,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -31279,18 +31279,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -31721,17 +31721,17 @@ @implementation MTRBaseClusterAdministratorCommissioning (Deprecated)
 - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterOpenCommissioningWindowParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self openCommissioningWindowWithParams:params completion:
-                                                       completionHandler];
+            completionHandler];
 }
 - (void)openBasicCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterOpenBasicCommissioningWindowParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self openBasicCommissioningWindowWithParams:params completion:
-                                                            completionHandler];
+            completionHandler];
 }
 - (void)revokeCommissioningWithParams:(MTRAdministratorCommissioningClusterRevokeCommissioningParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self revokeCommissioningWithParams:params completion:
-                                                   completionHandler];
+            completionHandler];
 }
 - (void)revokeCommissioningWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -31741,10 +31741,10 @@ - (void)revokeCommissioningWithCompletionHandler:(MTRStatusCompletion)completion
 - (void)readAttributeWindowStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWindowStatusWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeWindowStatusWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -31759,27 +31759,27 @@ - (void)subscribeAttributeWindowStatusWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWindowStatusWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWindowStatusWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWindowStatusWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeAdminFabricIndexWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAdminFabricIndexWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAdminFabricIndexWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -31794,27 +31794,27 @@ - (void)subscribeAttributeAdminFabricIndexWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAdminFabricIndexWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeAdminFabricIndexWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAdminFabricIndexWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeAdminVendorIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAdminVendorIdWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAdminVendorIdWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -31829,27 +31829,27 @@ - (void)subscribeAttributeAdminVendorIdWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAdminVendorIdWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeAdminVendorIdWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAdminVendorIdWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -31864,27 +31864,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -31899,27 +31899,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -31934,27 +31934,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -31969,27 +31969,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -32004,18 +32004,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -32661,72 +32661,72 @@ @implementation MTRBaseClusterOperationalCredentials (Deprecated)
 - (void)attestationRequestWithParams:(MTROperationalCredentialsClusterAttestationRequestParams *)params completionHandler:(void (^)(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self attestationRequestWithParams:params completion:
-                                                  ^(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                      // Cast is safe because subclass does not add any selectors.
-                                                      completionHandler(static_cast<MTROperationalCredentialsClusterAttestationResponseParams *>(data), error);
-                                                  }];
+            ^(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterAttestationResponseParams *>(data), error);
+            }];
 }
 - (void)certificateChainRequestWithParams:(MTROperationalCredentialsClusterCertificateChainRequestParams *)params completionHandler:(void (^)(MTROperationalCredentialsClusterCertificateChainResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self certificateChainRequestWithParams:params completion:
-                                                       ^(MTROperationalCredentialsClusterCertificateChainResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                           // Cast is safe because subclass does not add any selectors.
-                                                           completionHandler(static_cast<MTROperationalCredentialsClusterCertificateChainResponseParams *>(data), error);
-                                                       }];
+            ^(MTROperationalCredentialsClusterCertificateChainResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterCertificateChainResponseParams *>(data), error);
+            }];
 }
 - (void)CSRRequestWithParams:(MTROperationalCredentialsClusterCSRRequestParams *)params completionHandler:(void (^)(MTROperationalCredentialsClusterCSRResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self CSRRequestWithParams:params completion:
-                                          ^(MTROperationalCredentialsClusterCSRResponseParams * _Nullable data, NSError * _Nullable error) {
-                                              // Cast is safe because subclass does not add any selectors.
-                                              completionHandler(static_cast<MTROperationalCredentialsClusterCSRResponseParams *>(data), error);
-                                          }];
+            ^(MTROperationalCredentialsClusterCSRResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterCSRResponseParams *>(data), error);
+            }];
 }
 - (void)addNOCWithParams:(MTROperationalCredentialsClusterAddNOCParams *)params completionHandler:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self addNOCWithParams:params completion:
-                                      ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
-                                          // Cast is safe because subclass does not add any selectors.
-                                          completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
-                                      }];
+            ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
+            }];
 }
 - (void)updateNOCWithParams:(MTROperationalCredentialsClusterUpdateNOCParams *)params completionHandler:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self updateNOCWithParams:params completion:
-                                         ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
-                                             // Cast is safe because subclass does not add any selectors.
-                                             completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
-                                         }];
+            ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
+            }];
 }
 - (void)updateFabricLabelWithParams:(MTROperationalCredentialsClusterUpdateFabricLabelParams *)params completionHandler:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self updateFabricLabelWithParams:params completion:
-                                                 ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                     // Cast is safe because subclass does not add any selectors.
-                                                     completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
-                                                 }];
+            ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
+            }];
 }
 - (void)removeFabricWithParams:(MTROperationalCredentialsClusterRemoveFabricParams *)params completionHandler:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self removeFabricWithParams:params completion:
-                                            ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                // Cast is safe because subclass does not add any selectors.
-                                                completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
-                                            }];
+            ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
+            }];
 }
 - (void)addTrustedRootCertificateWithParams:(MTROperationalCredentialsClusterAddTrustedRootCertificateParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self addTrustedRootCertificateWithParams:params completion:
-                                                         completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeNOCsWithParams:(MTRReadParams * _Nullable)params completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNOCsWithParams:params completion:
-                                                 ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                     // Cast is safe because subclass does not add any selectors.
-                                                     completionHandler(static_cast<NSArray *>(value), error);
-                                                 }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNOCsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                        params:(MTRSubscribeParams * _Nullable)params
@@ -32741,27 +32741,27 @@ - (void)subscribeAttributeNOCsWithMinInterval:(NSNumber * _Nonnull)minInterval m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNOCsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeNOCsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNOCsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFabricsWithParams:(MTRReadParams * _Nullable)params completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFabricsWithParams:params completion:
-                                                    ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                        // Cast is safe because subclass does not add any selectors.
-                                                        completionHandler(static_cast<NSArray *>(value), error);
-                                                    }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                           params:(MTRSubscribeParams * _Nullable)params
@@ -32776,27 +32776,27 @@ - (void)subscribeAttributeFabricsWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFabricsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeFabricsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFabricsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeSupportedFabricsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedFabricsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSupportedFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -32811,27 +32811,27 @@ - (void)subscribeAttributeSupportedFabricsWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSupportedFabricsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSupportedFabricsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedFabricsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCommissionedFabricsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCommissionedFabricsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCommissionedFabricsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -32846,27 +32846,27 @@ - (void)subscribeAttributeCommissionedFabricsWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCommissionedFabricsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCommissionedFabricsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCommissionedFabricsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTrustedRootCertificatesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTrustedRootCertificatesWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTrustedRootCertificatesWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                           params:(MTRSubscribeParams * _Nullable)params
@@ -32881,27 +32881,27 @@ - (void)subscribeAttributeTrustedRootCertificatesWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTrustedRootCertificatesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeTrustedRootCertificatesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTrustedRootCertificatesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentFabricIndexWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentFabricIndexWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentFabricIndexWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -32916,27 +32916,27 @@ - (void)subscribeAttributeCurrentFabricIndexWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentFabricIndexWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentFabricIndexWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentFabricIndexWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -32951,27 +32951,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -32986,27 +32986,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -33021,27 +33021,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -33056,27 +33056,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -33091,18 +33091,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -33635,37 +33635,37 @@ @implementation MTRBaseClusterGroupKeyManagement (Deprecated)
 - (void)keySetWriteWithParams:(MTRGroupKeyManagementClusterKeySetWriteParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self keySetWriteWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 - (void)keySetReadWithParams:(MTRGroupKeyManagementClusterKeySetReadParams *)params completionHandler:(void (^)(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self keySetReadWithParams:params completion:
-                                          ^(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data, NSError * _Nullable error) {
-                                              // Cast is safe because subclass does not add any selectors.
-                                              completionHandler(static_cast<MTRGroupKeyManagementClusterKeySetReadResponseParams *>(data), error);
-                                          }];
+            ^(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupKeyManagementClusterKeySetReadResponseParams *>(data), error);
+            }];
 }
 - (void)keySetRemoveWithParams:(MTRGroupKeyManagementClusterKeySetRemoveParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self keySetRemoveWithParams:params completion:
-                                            completionHandler];
+            completionHandler];
 }
 - (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params completionHandler:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self keySetReadAllIndicesWithParams:params completion:
-                                                    ^(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                        // Cast is safe because subclass does not add any selectors.
-                                                        completionHandler(static_cast<MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams *>(data), error);
-                                                    }];
+            ^(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams *>(data), error);
+            }];
 }
 
 - (void)readAttributeGroupKeyMapWithParams:(MTRReadParams * _Nullable)params completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGroupKeyMapWithParams:params completion:
-                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                            // Cast is safe because subclass does not add any selectors.
-                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeGroupKeyMapWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -33688,27 +33688,27 @@ - (void)subscribeAttributeGroupKeyMapWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGroupKeyMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                             }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGroupKeyMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGroupKeyMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeGroupTableWithParams:(MTRReadParams * _Nullable)params completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGroupTableWithParams:params completion:
-                                                       ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                           // Cast is safe because subclass does not add any selectors.
-                                                           completionHandler(static_cast<NSArray *>(value), error);
-                                                       }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGroupTableWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -33723,27 +33723,27 @@ - (void)subscribeAttributeGroupTableWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGroupTableWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGroupTableWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGroupTableWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxGroupsPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxGroupsPerFabricWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxGroupsPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -33758,27 +33758,27 @@ - (void)subscribeAttributeMaxGroupsPerFabricWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxGroupsPerFabricWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxGroupsPerFabricWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxGroupsPerFabricWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxGroupKeysPerFabricWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxGroupKeysPerFabricWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxGroupKeysPerFabricWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -33793,27 +33793,27 @@ - (void)subscribeAttributeMaxGroupKeysPerFabricWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxGroupKeysPerFabricWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxGroupKeysPerFabricWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxGroupKeysPerFabricWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -33828,27 +33828,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -33863,27 +33863,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -33898,27 +33898,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -33933,27 +33933,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -33968,18 +33968,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -34252,10 +34252,10 @@ @implementation MTRBaseClusterFixedLabel (Deprecated)
 - (void)readAttributeLabelListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLabelListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLabelListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -34270,27 +34270,27 @@ - (void)subscribeAttributeLabelListWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLabelListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                           }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeLabelListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLabelListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -34305,27 +34305,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -34340,27 +34340,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -34375,27 +34375,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -34410,27 +34410,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -34445,18 +34445,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -34779,10 +34779,10 @@ @implementation MTRBaseClusterUserLabel (Deprecated)
 - (void)readAttributeLabelListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLabelListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeLabelListWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -34805,27 +34805,27 @@ - (void)subscribeAttributeLabelListWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLabelListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                           }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeLabelListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLabelListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -34840,27 +34840,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -34875,27 +34875,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -34910,27 +34910,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -34945,27 +34945,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -34980,18 +34980,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -35264,10 +35264,10 @@ @implementation MTRBaseClusterBooleanState (Deprecated)
 - (void)readAttributeStateValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStateValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeStateValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -35282,27 +35282,27 @@ - (void)subscribeAttributeStateValueWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStateValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeStateValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStateValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -35317,27 +35317,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -35352,27 +35352,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -35387,27 +35387,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -35422,27 +35422,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -35457,18 +35457,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -38423,16 +38423,16 @@ @implementation MTRBaseClusterModeSelect (Deprecated)
 - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self changeToModeWithParams:params completion:
-                                            completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeDescriptionWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDescriptionWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -38447,27 +38447,27 @@ - (void)subscribeAttributeDescriptionWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDescriptionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeDescriptionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDescriptionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeStandardNamespaceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStandardNamespaceWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeStandardNamespaceWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -38482,27 +38482,27 @@ - (void)subscribeAttributeStandardNamespaceWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStandardNamespaceWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeStandardNamespaceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStandardNamespaceWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSupportedModesWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedModesWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSupportedModesWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -38517,27 +38517,27 @@ - (void)subscribeAttributeSupportedModesWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSupportedModesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeSupportedModesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedModesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                   }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -38552,27 +38552,27 @@ - (void)subscribeAttributeCurrentModeWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeStartUpModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartUpModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -38595,27 +38595,27 @@ - (void)subscribeAttributeStartUpModeWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStartUpModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeStartUpModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartUpModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOnModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -38638,27 +38638,27 @@ - (void)subscribeAttributeOnModeWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOnModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOnModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOnModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -38673,27 +38673,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -38708,27 +38708,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -38743,27 +38743,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -38778,27 +38778,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -38813,18 +38813,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -58190,119 +58190,119 @@ @implementation MTRBaseClusterDoorLock (Deprecated)
 - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self lockDoorWithParams:params completion:
-                                        completionHandler];
+            completionHandler];
 }
 - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self unlockDoorWithParams:params completion:
-                                          completionHandler];
+            completionHandler];
 }
 - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self unlockWithTimeoutWithParams:params completion:
-                                                 completionHandler];
+            completionHandler];
 }
 - (void)setWeekDayScheduleWithParams:(MTRDoorLockClusterSetWeekDayScheduleParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setWeekDayScheduleWithParams:params completion:
-                                                  completionHandler];
+            completionHandler];
 }
 - (void)getWeekDayScheduleWithParams:(MTRDoorLockClusterGetWeekDayScheduleParams *)params completionHandler:(void (^)(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getWeekDayScheduleWithParams:params completion:
-                                                  ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                      // Cast is safe because subclass does not add any selectors.
-                                                      completionHandler(static_cast<MTRDoorLockClusterGetWeekDayScheduleResponseParams *>(data), error);
-                                                  }];
+            ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterGetWeekDayScheduleResponseParams *>(data), error);
+            }];
 }
 - (void)clearWeekDayScheduleWithParams:(MTRDoorLockClusterClearWeekDayScheduleParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearWeekDayScheduleWithParams:params completion:
-                                                    completionHandler];
+            completionHandler];
 }
 - (void)setYearDayScheduleWithParams:(MTRDoorLockClusterSetYearDayScheduleParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setYearDayScheduleWithParams:params completion:
-                                                  completionHandler];
+            completionHandler];
 }
 - (void)getYearDayScheduleWithParams:(MTRDoorLockClusterGetYearDayScheduleParams *)params completionHandler:(void (^)(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getYearDayScheduleWithParams:params completion:
-                                                  ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                      // Cast is safe because subclass does not add any selectors.
-                                                      completionHandler(static_cast<MTRDoorLockClusterGetYearDayScheduleResponseParams *>(data), error);
-                                                  }];
+            ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterGetYearDayScheduleResponseParams *>(data), error);
+            }];
 }
 - (void)clearYearDayScheduleWithParams:(MTRDoorLockClusterClearYearDayScheduleParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearYearDayScheduleWithParams:params completion:
-                                                    completionHandler];
+            completionHandler];
 }
 - (void)setHolidayScheduleWithParams:(MTRDoorLockClusterSetHolidayScheduleParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setHolidayScheduleWithParams:params completion:
-                                                  completionHandler];
+            completionHandler];
 }
 - (void)getHolidayScheduleWithParams:(MTRDoorLockClusterGetHolidayScheduleParams *)params completionHandler:(void (^)(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getHolidayScheduleWithParams:params completion:
-                                                  ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                      // Cast is safe because subclass does not add any selectors.
-                                                      completionHandler(static_cast<MTRDoorLockClusterGetHolidayScheduleResponseParams *>(data), error);
-                                                  }];
+            ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterGetHolidayScheduleResponseParams *>(data), error);
+            }];
 }
 - (void)clearHolidayScheduleWithParams:(MTRDoorLockClusterClearHolidayScheduleParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearHolidayScheduleWithParams:params completion:
-                                                    completionHandler];
+            completionHandler];
 }
 - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setUserWithParams:params completion:
-                                       completionHandler];
+            completionHandler];
 }
 - (void)getUserWithParams:(MTRDoorLockClusterGetUserParams *)params completionHandler:(void (^)(MTRDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getUserWithParams:params completion:
-                                       ^(MTRDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error) {
-                                           // Cast is safe because subclass does not add any selectors.
-                                           completionHandler(static_cast<MTRDoorLockClusterGetUserResponseParams *>(data), error);
-                                       }];
+            ^(MTRDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterGetUserResponseParams *>(data), error);
+            }];
 }
 - (void)clearUserWithParams:(MTRDoorLockClusterClearUserParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearUserWithParams:params completion:
-                                         completionHandler];
+            completionHandler];
 }
 - (void)setCredentialWithParams:(MTRDoorLockClusterSetCredentialParams *)params completionHandler:(void (^)(MTRDoorLockClusterSetCredentialResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self setCredentialWithParams:params completion:
-                                             ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                 // Cast is safe because subclass does not add any selectors.
-                                                 completionHandler(static_cast<MTRDoorLockClusterSetCredentialResponseParams *>(data), error);
-                                             }];
+            ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterSetCredentialResponseParams *>(data), error);
+            }];
 }
 - (void)getCredentialStatusWithParams:(MTRDoorLockClusterGetCredentialStatusParams *)params completionHandler:(void (^)(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getCredentialStatusWithParams:params completion:
-                                                   ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                       // Cast is safe because subclass does not add any selectors.
-                                                       completionHandler(static_cast<MTRDoorLockClusterGetCredentialStatusResponseParams *>(data), error);
-                                                   }];
+            ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterGetCredentialStatusResponseParams *>(data), error);
+            }];
 }
 - (void)clearCredentialWithParams:(MTRDoorLockClusterClearCredentialParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearCredentialWithParams:params completion:
-                                               completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeLockStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLockStateWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLockStateWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -58317,27 +58317,27 @@ - (void)subscribeAttributeLockStateWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLockStateWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLockStateWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLockStateWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLockTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLockTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLockTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -58352,27 +58352,27 @@ - (void)subscribeAttributeLockTypeWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLockTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLockTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLockTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeActuatorEnabledWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActuatorEnabledWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeActuatorEnabledWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -58387,27 +58387,27 @@ - (void)subscribeAttributeActuatorEnabledWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeActuatorEnabledWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeActuatorEnabledWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeActuatorEnabledWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeDoorStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDoorStateWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeDoorStateWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -58422,27 +58422,27 @@ - (void)subscribeAttributeDoorStateWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDoorStateWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeDoorStateWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDoorStateWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeDoorOpenEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDoorOpenEventsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeDoorOpenEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -58465,27 +58465,27 @@ - (void)subscribeAttributeDoorOpenEventsWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDoorOpenEventsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeDoorOpenEventsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDoorOpenEventsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeDoorClosedEventsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDoorClosedEventsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeDoorClosedEventsWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -58508,27 +58508,27 @@ - (void)subscribeAttributeDoorClosedEventsWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDoorClosedEventsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeDoorClosedEventsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDoorClosedEventsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOpenPeriodWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOpenPeriodWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOpenPeriodWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -58551,27 +58551,27 @@ - (void)subscribeAttributeOpenPeriodWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOpenPeriodWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOpenPeriodWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOpenPeriodWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfTotalUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfTotalUsersSupportedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfTotalUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                               params:(MTRSubscribeParams * _Nullable)params
@@ -58586,27 +58586,27 @@ - (void)subscribeAttributeNumberOfTotalUsersSupportedWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfTotalUsersSupportedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfTotalUsersSupportedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfTotalUsersSupportedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfPINUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfPINUsersSupportedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfPINUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                             params:(MTRSubscribeParams * _Nullable)params
@@ -58621,27 +58621,27 @@ - (void)subscribeAttributeNumberOfPINUsersSupportedWithMinInterval:(NSNumber * _
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfPINUsersSupportedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfPINUsersSupportedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfPINUsersSupportedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfRFIDUsersSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfRFIDUsersSupportedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfRFIDUsersSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                              params:(MTRSubscribeParams * _Nullable)params
@@ -58656,27 +58656,27 @@ - (void)subscribeAttributeNumberOfRFIDUsersSupportedWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfRFIDUsersSupportedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfRFIDUsersSupportedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfRFIDUsersSupportedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                            params:(MTRSubscribeParams * _Nullable)params
@@ -58691,27 +58691,27 @@ - (void)subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithMinInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfWeekDaySchedulesSupportedPerUserWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfWeekDaySchedulesSupportedPerUserWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfYearDaySchedulesSupportedPerUserWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                            params:(MTRSubscribeParams * _Nullable)params
@@ -58726,27 +58726,27 @@ - (void)subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithMinInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfYearDaySchedulesSupportedPerUserWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfYearDaySchedulesSupportedPerUserWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfYearDaySchedulesSupportedPerUserWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfHolidaySchedulesSupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfHolidaySchedulesSupportedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfHolidaySchedulesSupportedWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -58761,27 +58761,27 @@ - (void)subscribeAttributeNumberOfHolidaySchedulesSupportedWithMinInterval:(NSNu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfHolidaySchedulesSupportedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfHolidaySchedulesSupportedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfHolidaySchedulesSupportedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxPINCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxPINCodeLengthWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -58796,27 +58796,27 @@ - (void)subscribeAttributeMaxPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxPINCodeLengthWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxPINCodeLengthWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxPINCodeLengthWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinPINCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinPINCodeLengthWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -58831,27 +58831,27 @@ - (void)subscribeAttributeMinPINCodeLengthWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinPINCodeLengthWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinPINCodeLengthWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinPINCodeLengthWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxRFIDCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxRFIDCodeLengthWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -58866,27 +58866,27 @@ - (void)subscribeAttributeMaxRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxRFIDCodeLengthWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxRFIDCodeLengthWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxRFIDCodeLengthWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinRFIDCodeLengthWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinRFIDCodeLengthWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -58901,27 +58901,27 @@ - (void)subscribeAttributeMinRFIDCodeLengthWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinRFIDCodeLengthWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinRFIDCodeLengthWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinRFIDCodeLengthWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCredentialRulesSupportWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCredentialRulesSupportWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCredentialRulesSupportWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -58936,27 +58936,27 @@ - (void)subscribeAttributeCredentialRulesSupportWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCredentialRulesSupportWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCredentialRulesSupportWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCredentialRulesSupportWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfCredentialsSupportedPerUserWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfCredentialsSupportedPerUserWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfCredentialsSupportedPerUserWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -58971,27 +58971,27 @@ - (void)subscribeAttributeNumberOfCredentialsSupportedPerUserWithMinInterval:(NS
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfCredentialsSupportedPerUserWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfCredentialsSupportedPerUserWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfCredentialsSupportedPerUserWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLanguageWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLanguageWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)writeAttributeLanguageWithValue:(NSString * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59014,27 +59014,27 @@ - (void)subscribeAttributeLanguageWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLanguageWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                          }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeLanguageWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLanguageWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeLEDSettingsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLEDSettingsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeLEDSettingsWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59057,27 +59057,27 @@ - (void)subscribeAttributeLEDSettingsWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLEDSettingsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLEDSettingsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLEDSettingsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeAutoRelockTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAutoRelockTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeAutoRelockTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59100,27 +59100,27 @@ - (void)subscribeAttributeAutoRelockTimeWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAutoRelockTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeAutoRelockTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAutoRelockTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSoundVolumeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSoundVolumeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeSoundVolumeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59143,27 +59143,27 @@ - (void)subscribeAttributeSoundVolumeWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSoundVolumeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSoundVolumeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSoundVolumeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOperatingModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOperatingModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOperatingModeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59186,27 +59186,27 @@ - (void)subscribeAttributeOperatingModeWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOperatingModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOperatingModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOperatingModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSupportedOperatingModesWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedOperatingModesWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSupportedOperatingModesWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                           params:(MTRSubscribeParams * _Nullable)params
@@ -59221,27 +59221,27 @@ - (void)subscribeAttributeSupportedOperatingModesWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSupportedOperatingModesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSupportedOperatingModesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedOperatingModesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeDefaultConfigurationRegisterWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDefaultConfigurationRegisterWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeDefaultConfigurationRegisterWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                params:(MTRSubscribeParams * _Nullable)params
@@ -59256,27 +59256,27 @@ - (void)subscribeAttributeDefaultConfigurationRegisterWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDefaultConfigurationRegisterWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeDefaultConfigurationRegisterWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDefaultConfigurationRegisterWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEnableLocalProgrammingWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnableLocalProgrammingWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeEnableLocalProgrammingWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59299,27 +59299,27 @@ - (void)subscribeAttributeEnableLocalProgrammingWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEnableLocalProgrammingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEnableLocalProgrammingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnableLocalProgrammingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEnableOneTouchLockingWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnableOneTouchLockingWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeEnableOneTouchLockingWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59342,27 +59342,27 @@ - (void)subscribeAttributeEnableOneTouchLockingWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEnableOneTouchLockingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEnableOneTouchLockingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnableOneTouchLockingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEnableInsideStatusLEDWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnableInsideStatusLEDWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeEnableInsideStatusLEDWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59385,27 +59385,27 @@ - (void)subscribeAttributeEnableInsideStatusLEDWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEnableInsideStatusLEDWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEnableInsideStatusLEDWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnableInsideStatusLEDWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEnablePrivacyModeButtonWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnablePrivacyModeButtonWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeEnablePrivacyModeButtonWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59428,27 +59428,27 @@ - (void)subscribeAttributeEnablePrivacyModeButtonWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEnablePrivacyModeButtonWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEnablePrivacyModeButtonWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnablePrivacyModeButtonWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLocalProgrammingFeaturesWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocalProgrammingFeaturesWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeLocalProgrammingFeaturesWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59471,27 +59471,27 @@ - (void)subscribeAttributeLocalProgrammingFeaturesWithMinInterval:(NSNumber * _N
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLocalProgrammingFeaturesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLocalProgrammingFeaturesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocalProgrammingFeaturesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWrongCodeEntryLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWrongCodeEntryLimitWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeWrongCodeEntryLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59514,27 +59514,27 @@ - (void)subscribeAttributeWrongCodeEntryLimitWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWrongCodeEntryLimitWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWrongCodeEntryLimitWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWrongCodeEntryLimitWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUserCodeTemporaryDisableTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUserCodeTemporaryDisableTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeUserCodeTemporaryDisableTimeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59557,27 +59557,27 @@ - (void)subscribeAttributeUserCodeTemporaryDisableTimeWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUserCodeTemporaryDisableTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUserCodeTemporaryDisableTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUserCodeTemporaryDisableTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSendPINOverTheAirWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSendPINOverTheAirWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeSendPINOverTheAirWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59600,27 +59600,27 @@ - (void)subscribeAttributeSendPINOverTheAirWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSendPINOverTheAirWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSendPINOverTheAirWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSendPINOverTheAirWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRequirePINforRemoteOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRequirePINforRemoteOperationWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeRequirePINforRemoteOperationWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59643,27 +59643,27 @@ - (void)subscribeAttributeRequirePINforRemoteOperationWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRequirePINforRemoteOperationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRequirePINforRemoteOperationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRequirePINforRemoteOperationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeExpiringUserTimeoutWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeExpiringUserTimeoutWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeExpiringUserTimeoutWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -59686,27 +59686,27 @@ - (void)subscribeAttributeExpiringUserTimeoutWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeExpiringUserTimeoutWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeExpiringUserTimeoutWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeExpiringUserTimeoutWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -59721,27 +59721,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -59756,27 +59756,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -59791,27 +59791,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -59826,27 +59826,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -59861,18 +59861,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -61110,7 +61110,7 @@ @implementation MTRBaseClusterWindowCovering (Deprecated)
 - (void)upOrOpenWithParams:(MTRWindowCoveringClusterUpOrOpenParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self upOrOpenWithParams:params completion:
-                                        completionHandler];
+            completionHandler];
 }
 - (void)upOrOpenWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -61119,7 +61119,7 @@ - (void)upOrOpenWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)downOrCloseWithParams:(MTRWindowCoveringClusterDownOrCloseParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self downOrCloseWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 - (void)downOrCloseWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -61128,7 +61128,7 @@ - (void)downOrCloseWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)stopMotionWithParams:(MTRWindowCoveringClusterStopMotionParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stopMotionWithParams:params completion:
-                                          completionHandler];
+            completionHandler];
 }
 - (void)stopMotionWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -61137,31 +61137,31 @@ - (void)stopMotionWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)goToLiftValueWithParams:(MTRWindowCoveringClusterGoToLiftValueParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self goToLiftValueWithParams:params completion:
-                                             completionHandler];
+            completionHandler];
 }
 - (void)goToLiftPercentageWithParams:(MTRWindowCoveringClusterGoToLiftPercentageParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self goToLiftPercentageWithParams:params completion:
-                                                  completionHandler];
+            completionHandler];
 }
 - (void)goToTiltValueWithParams:(MTRWindowCoveringClusterGoToTiltValueParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self goToTiltValueWithParams:params completion:
-                                             completionHandler];
+            completionHandler];
 }
 - (void)goToTiltPercentageWithParams:(MTRWindowCoveringClusterGoToTiltPercentageParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self goToTiltPercentageWithParams:params completion:
-                                                  completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                        params:(MTRSubscribeParams * _Nullable)params
@@ -61176,27 +61176,27 @@ - (void)subscribeAttributeTypeWithMinInterval:(NSNumber * _Nonnull)minInterval m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePhysicalClosedLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalClosedLimitLiftWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePhysicalClosedLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                           params:(MTRSubscribeParams * _Nullable)params
@@ -61211,27 +61211,27 @@ - (void)subscribeAttributePhysicalClosedLimitLiftWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePhysicalClosedLimitLiftWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePhysicalClosedLimitLiftWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalClosedLimitLiftWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePhysicalClosedLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalClosedLimitTiltWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePhysicalClosedLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                           params:(MTRSubscribeParams * _Nullable)params
@@ -61246,27 +61246,27 @@ - (void)subscribeAttributePhysicalClosedLimitTiltWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePhysicalClosedLimitTiltWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePhysicalClosedLimitTiltWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalClosedLimitTiltWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentPositionLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionLiftWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentPositionLiftWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -61281,27 +61281,27 @@ - (void)subscribeAttributeCurrentPositionLiftWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentPositionLiftWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentPositionLiftWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionLiftWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentPositionTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionTiltWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentPositionTiltWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -61316,27 +61316,27 @@ - (void)subscribeAttributeCurrentPositionTiltWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentPositionTiltWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentPositionTiltWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionTiltWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfActuationsLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfActuationsLiftWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfActuationsLiftWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -61351,27 +61351,27 @@ - (void)subscribeAttributeNumberOfActuationsLiftWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfActuationsLiftWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfActuationsLiftWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfActuationsLiftWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfActuationsTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfActuationsTiltWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfActuationsTiltWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -61386,27 +61386,27 @@ - (void)subscribeAttributeNumberOfActuationsTiltWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfActuationsTiltWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfActuationsTiltWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfActuationsTiltWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeConfigStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeConfigStatusWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeConfigStatusWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -61421,27 +61421,27 @@ - (void)subscribeAttributeConfigStatusWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeConfigStatusWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeConfigStatusWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeConfigStatusWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentPositionLiftPercentageWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionLiftPercentageWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentPositionLiftPercentageWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -61456,27 +61456,27 @@ - (void)subscribeAttributeCurrentPositionLiftPercentageWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentPositionLiftPercentageWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentPositionLiftPercentageWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionLiftPercentageWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentPositionTiltPercentageWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionTiltPercentageWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentPositionTiltPercentageWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -61491,27 +61491,27 @@ - (void)subscribeAttributeCurrentPositionTiltPercentageWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentPositionTiltPercentageWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentPositionTiltPercentageWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionTiltPercentageWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOperationalStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOperationalStatusWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOperationalStatusWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -61526,27 +61526,27 @@ - (void)subscribeAttributeOperationalStatusWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOperationalStatusWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOperationalStatusWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOperationalStatusWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTargetPositionLiftPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTargetPositionLiftPercent100thsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTargetPositionLiftPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -61561,27 +61561,27 @@ - (void)subscribeAttributeTargetPositionLiftPercent100thsWithMinInterval:(NSNumb
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTargetPositionLiftPercent100thsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTargetPositionLiftPercent100thsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTargetPositionLiftPercent100thsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTargetPositionTiltPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTargetPositionTiltPercent100thsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTargetPositionTiltPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -61596,27 +61596,27 @@ - (void)subscribeAttributeTargetPositionTiltPercent100thsWithMinInterval:(NSNumb
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTargetPositionTiltPercent100thsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTargetPositionTiltPercent100thsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTargetPositionTiltPercent100thsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEndProductTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEndProductTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeEndProductTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -61631,27 +61631,27 @@ - (void)subscribeAttributeEndProductTypeWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEndProductTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEndProductTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEndProductTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionLiftPercent100thsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentPositionLiftPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -61666,27 +61666,27 @@ - (void)subscribeAttributeCurrentPositionLiftPercent100thsWithMinInterval:(NSNum
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentPositionLiftPercent100thsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentPositionLiftPercent100thsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionLiftPercent100thsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentPositionTiltPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionTiltPercent100thsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentPositionTiltPercent100thsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -61701,27 +61701,27 @@ - (void)subscribeAttributeCurrentPositionTiltPercent100thsWithMinInterval:(NSNum
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentPositionTiltPercent100thsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentPositionTiltPercent100thsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentPositionTiltPercent100thsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInstalledOpenLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInstalledOpenLimitLiftWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeInstalledOpenLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -61736,27 +61736,27 @@ - (void)subscribeAttributeInstalledOpenLimitLiftWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInstalledOpenLimitLiftWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInstalledOpenLimitLiftWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInstalledOpenLimitLiftWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInstalledClosedLimitLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInstalledClosedLimitLiftWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeInstalledClosedLimitLiftWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                            params:(MTRSubscribeParams * _Nullable)params
@@ -61771,27 +61771,27 @@ - (void)subscribeAttributeInstalledClosedLimitLiftWithMinInterval:(NSNumber * _N
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInstalledClosedLimitLiftWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInstalledClosedLimitLiftWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInstalledClosedLimitLiftWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInstalledOpenLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInstalledOpenLimitTiltWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeInstalledOpenLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -61806,27 +61806,27 @@ - (void)subscribeAttributeInstalledOpenLimitTiltWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInstalledOpenLimitTiltWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInstalledOpenLimitTiltWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInstalledOpenLimitTiltWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInstalledClosedLimitTiltWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInstalledClosedLimitTiltWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeInstalledClosedLimitTiltWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                            params:(MTRSubscribeParams * _Nullable)params
@@ -61841,27 +61841,27 @@ - (void)subscribeAttributeInstalledClosedLimitTiltWithMinInterval:(NSNumber * _N
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInstalledClosedLimitTiltWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInstalledClosedLimitTiltWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInstalledClosedLimitTiltWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeModeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -61884,27 +61884,27 @@ - (void)subscribeAttributeModeWithMinInterval:(NSNumber * _Nonnull)minInterval m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSafetyStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSafetyStatusWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSafetyStatusWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -61919,27 +61919,27 @@ - (void)subscribeAttributeSafetyStatusWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSafetyStatusWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSafetyStatusWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSafetyStatusWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -61954,27 +61954,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -61989,27 +61989,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -62024,27 +62024,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -62059,27 +62059,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -62094,18 +62094,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -63777,10 +63777,10 @@ @implementation MTRBaseClusterPumpConfigurationAndControl (Deprecated)
 - (void)readAttributeMaxPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxPressureWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxPressureWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -63795,27 +63795,27 @@ - (void)subscribeAttributeMaxPressureWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxPressureWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxPressureWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxPressureWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxSpeedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -63830,27 +63830,27 @@ - (void)subscribeAttributeMaxSpeedWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxSpeedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxSpeedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxSpeedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxFlowWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxFlowWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxFlowWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                           params:(MTRSubscribeParams * _Nullable)params
@@ -63865,27 +63865,27 @@ - (void)subscribeAttributeMaxFlowWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxFlowWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxFlowWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxFlowWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinConstPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinConstPressureWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinConstPressureWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -63900,27 +63900,27 @@ - (void)subscribeAttributeMinConstPressureWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinConstPressureWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinConstPressureWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinConstPressureWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxConstPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxConstPressureWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxConstPressureWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -63935,27 +63935,27 @@ - (void)subscribeAttributeMaxConstPressureWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxConstPressureWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxConstPressureWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxConstPressureWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinCompPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinCompPressureWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinCompPressureWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -63970,27 +63970,27 @@ - (void)subscribeAttributeMinCompPressureWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinCompPressureWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinCompPressureWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinCompPressureWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxCompPressureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxCompPressureWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxCompPressureWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -64005,27 +64005,27 @@ - (void)subscribeAttributeMaxCompPressureWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxCompPressureWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxCompPressureWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxCompPressureWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinConstSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinConstSpeedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinConstSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -64040,27 +64040,27 @@ - (void)subscribeAttributeMinConstSpeedWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinConstSpeedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinConstSpeedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinConstSpeedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxConstSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxConstSpeedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxConstSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -64075,27 +64075,27 @@ - (void)subscribeAttributeMaxConstSpeedWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxConstSpeedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxConstSpeedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxConstSpeedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinConstFlowWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinConstFlowWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinConstFlowWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -64110,27 +64110,27 @@ - (void)subscribeAttributeMinConstFlowWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinConstFlowWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinConstFlowWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinConstFlowWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxConstFlowWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxConstFlowWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxConstFlowWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -64145,27 +64145,27 @@ - (void)subscribeAttributeMaxConstFlowWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxConstFlowWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxConstFlowWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxConstFlowWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinConstTempWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinConstTempWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinConstTempWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -64180,27 +64180,27 @@ - (void)subscribeAttributeMinConstTempWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinConstTempWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinConstTempWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinConstTempWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxConstTempWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxConstTempWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxConstTempWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -64215,27 +64215,27 @@ - (void)subscribeAttributeMaxConstTempWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxConstTempWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxConstTempWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxConstTempWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePumpStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePumpStatusWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePumpStatusWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -64250,27 +64250,27 @@ - (void)subscribeAttributePumpStatusWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePumpStatusWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePumpStatusWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePumpStatusWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEffectiveOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEffectiveOperationModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeEffectiveOperationModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -64285,27 +64285,27 @@ - (void)subscribeAttributeEffectiveOperationModeWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEffectiveOperationModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEffectiveOperationModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEffectiveOperationModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEffectiveControlModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEffectiveControlModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeEffectiveControlModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -64320,27 +64320,27 @@ - (void)subscribeAttributeEffectiveControlModeWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEffectiveControlModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEffectiveControlModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEffectiveControlModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCapacityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCapacityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCapacityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -64355,27 +64355,27 @@ - (void)subscribeAttributeCapacityWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCapacityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCapacityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCapacityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSpeedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                         params:(MTRSubscribeParams * _Nullable)params
@@ -64390,27 +64390,27 @@ - (void)subscribeAttributeSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSpeedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSpeedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSpeedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLifetimeRunningHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLifetimeRunningHoursWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeLifetimeRunningHoursWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -64433,27 +64433,27 @@ - (void)subscribeAttributeLifetimeRunningHoursWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLifetimeRunningHoursWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLifetimeRunningHoursWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLifetimeRunningHoursWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePowerWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePowerWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePowerWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                         params:(MTRSubscribeParams * _Nullable)params
@@ -64468,27 +64468,27 @@ - (void)subscribeAttributePowerWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePowerWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePowerWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePowerWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLifetimeEnergyConsumedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLifetimeEnergyConsumedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeLifetimeEnergyConsumedWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -64511,27 +64511,27 @@ - (void)subscribeAttributeLifetimeEnergyConsumedWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLifetimeEnergyConsumedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLifetimeEnergyConsumedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLifetimeEnergyConsumedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOperationModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOperationModeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -64554,27 +64554,27 @@ - (void)subscribeAttributeOperationModeWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOperationModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOperationModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOperationModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeControlModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeControlModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeControlModeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -64597,27 +64597,27 @@ - (void)subscribeAttributeControlModeWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeControlModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeControlModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeControlModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -64632,27 +64632,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -64667,27 +64667,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -64702,27 +64702,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -64737,27 +64737,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -64772,18 +64772,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -68310,25 +68310,25 @@ @implementation MTRBaseClusterThermostat (Deprecated)
 - (void)setpointRaiseLowerWithParams:(MTRThermostatClusterSetpointRaiseLowerParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setpointRaiseLowerWithParams:params completion:
-                                                  completionHandler];
+            completionHandler];
 }
 - (void)setWeeklyScheduleWithParams:(MTRThermostatClusterSetWeeklyScheduleParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setWeeklyScheduleWithParams:params completion:
-                                                 completionHandler];
+            completionHandler];
 }
 - (void)getWeeklyScheduleWithParams:(MTRThermostatClusterGetWeeklyScheduleParams *)params completionHandler:(void (^)(MTRThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getWeeklyScheduleWithParams:params completion:
-                                                 ^(MTRThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                     // Cast is safe because subclass does not add any selectors.
-                                                     completionHandler(static_cast<MTRThermostatClusterGetWeeklyScheduleResponseParams *>(data), error);
-                                                 }];
+            ^(MTRThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRThermostatClusterGetWeeklyScheduleResponseParams *>(data), error);
+            }];
 }
 - (void)clearWeeklyScheduleWithParams:(MTRThermostatClusterClearWeeklyScheduleParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearWeeklyScheduleWithParams:params completion:
-                                                   completionHandler];
+            completionHandler];
 }
 - (void)clearWeeklyScheduleWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -68338,10 +68338,10 @@ - (void)clearWeeklyScheduleWithCompletionHandler:(MTRStatusCompletion)completion
 - (void)readAttributeLocalTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocalTemperatureWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLocalTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -68356,27 +68356,27 @@ - (void)subscribeAttributeLocalTemperatureWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLocalTemperatureWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLocalTemperatureWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocalTemperatureWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOutdoorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOutdoorTemperatureWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOutdoorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -68391,27 +68391,27 @@ - (void)subscribeAttributeOutdoorTemperatureWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOutdoorTemperatureWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOutdoorTemperatureWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOutdoorTemperatureWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOccupancyWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupancyWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -68426,27 +68426,27 @@ - (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOccupancyWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOccupancyWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupancyWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeAbsMinHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAbsMinHeatSetpointLimitWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAbsMinHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                           params:(MTRSubscribeParams * _Nullable)params
@@ -68461,27 +68461,27 @@ - (void)subscribeAttributeAbsMinHeatSetpointLimitWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAbsMinHeatSetpointLimitWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeAbsMinHeatSetpointLimitWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAbsMinHeatSetpointLimitWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeAbsMaxHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAbsMaxHeatSetpointLimitWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAbsMaxHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                           params:(MTRSubscribeParams * _Nullable)params
@@ -68496,27 +68496,27 @@ - (void)subscribeAttributeAbsMaxHeatSetpointLimitWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAbsMaxHeatSetpointLimitWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeAbsMaxHeatSetpointLimitWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAbsMaxHeatSetpointLimitWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeAbsMinCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAbsMinCoolSetpointLimitWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAbsMinCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                           params:(MTRSubscribeParams * _Nullable)params
@@ -68531,27 +68531,27 @@ - (void)subscribeAttributeAbsMinCoolSetpointLimitWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAbsMinCoolSetpointLimitWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeAbsMinCoolSetpointLimitWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAbsMinCoolSetpointLimitWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeAbsMaxCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAbsMaxCoolSetpointLimitWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAbsMaxCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                           params:(MTRSubscribeParams * _Nullable)params
@@ -68566,27 +68566,27 @@ - (void)subscribeAttributeAbsMaxCoolSetpointLimitWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAbsMaxCoolSetpointLimitWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeAbsMaxCoolSetpointLimitWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAbsMaxCoolSetpointLimitWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePICoolingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePICoolingDemandWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePICoolingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -68601,27 +68601,27 @@ - (void)subscribeAttributePICoolingDemandWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePICoolingDemandWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePICoolingDemandWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePICoolingDemandWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePIHeatingDemandWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePIHeatingDemandWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePIHeatingDemandWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -68636,27 +68636,27 @@ - (void)subscribeAttributePIHeatingDemandWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePIHeatingDemandWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePIHeatingDemandWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePIHeatingDemandWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeHVACSystemTypeConfigurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHVACSystemTypeConfigurationWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeHVACSystemTypeConfigurationWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -68679,27 +68679,27 @@ - (void)subscribeAttributeHVACSystemTypeConfigurationWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeHVACSystemTypeConfigurationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeHVACSystemTypeConfigurationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeHVACSystemTypeConfigurationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLocalTemperatureCalibrationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocalTemperatureCalibrationWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeLocalTemperatureCalibrationWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -68722,27 +68722,27 @@ - (void)subscribeAttributeLocalTemperatureCalibrationWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLocalTemperatureCalibrationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLocalTemperatureCalibrationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLocalTemperatureCalibrationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOccupiedCoolingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupiedCoolingSetpointWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -68765,27 +68765,27 @@ - (void)subscribeAttributeOccupiedCoolingSetpointWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOccupiedCoolingSetpointWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOccupiedCoolingSetpointWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupiedCoolingSetpointWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOccupiedHeatingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupiedHeatingSetpointWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -68808,27 +68808,27 @@ - (void)subscribeAttributeOccupiedHeatingSetpointWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOccupiedHeatingSetpointWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOccupiedHeatingSetpointWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupiedHeatingSetpointWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUnoccupiedCoolingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnoccupiedCoolingSetpointWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeUnoccupiedCoolingSetpointWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -68851,27 +68851,27 @@ - (void)subscribeAttributeUnoccupiedCoolingSetpointWithMinInterval:(NSNumber * _
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUnoccupiedCoolingSetpointWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUnoccupiedCoolingSetpointWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnoccupiedCoolingSetpointWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUnoccupiedHeatingSetpointWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnoccupiedHeatingSetpointWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeUnoccupiedHeatingSetpointWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -68894,27 +68894,27 @@ - (void)subscribeAttributeUnoccupiedHeatingSetpointWithMinInterval:(NSNumber * _
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUnoccupiedHeatingSetpointWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUnoccupiedHeatingSetpointWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnoccupiedHeatingSetpointWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinHeatSetpointLimitWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeMinHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -68937,27 +68937,27 @@ - (void)subscribeAttributeMinHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinHeatSetpointLimitWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinHeatSetpointLimitWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinHeatSetpointLimitWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxHeatSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxHeatSetpointLimitWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeMaxHeatSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -68980,27 +68980,27 @@ - (void)subscribeAttributeMaxHeatSetpointLimitWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxHeatSetpointLimitWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxHeatSetpointLimitWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxHeatSetpointLimitWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinCoolSetpointLimitWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeMinCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69023,27 +69023,27 @@ - (void)subscribeAttributeMinCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinCoolSetpointLimitWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinCoolSetpointLimitWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinCoolSetpointLimitWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxCoolSetpointLimitWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxCoolSetpointLimitWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeMaxCoolSetpointLimitWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69066,27 +69066,27 @@ - (void)subscribeAttributeMaxCoolSetpointLimitWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxCoolSetpointLimitWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxCoolSetpointLimitWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxCoolSetpointLimitWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinSetpointDeadBandWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinSetpointDeadBandWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeMinSetpointDeadBandWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69109,27 +69109,27 @@ - (void)subscribeAttributeMinSetpointDeadBandWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinSetpointDeadBandWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinSetpointDeadBandWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinSetpointDeadBandWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRemoteSensingWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRemoteSensingWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeRemoteSensingWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69152,27 +69152,27 @@ - (void)subscribeAttributeRemoteSensingWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRemoteSensingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRemoteSensingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRemoteSensingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeControlSequenceOfOperationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeControlSequenceOfOperationWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeControlSequenceOfOperationWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69195,27 +69195,27 @@ - (void)subscribeAttributeControlSequenceOfOperationWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeControlSequenceOfOperationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeControlSequenceOfOperationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeControlSequenceOfOperationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSystemModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSystemModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeSystemModeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69238,27 +69238,27 @@ - (void)subscribeAttributeSystemModeWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSystemModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSystemModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSystemModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeThermostatRunningModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeThermostatRunningModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeThermostatRunningModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                         params:(MTRSubscribeParams * _Nullable)params
@@ -69273,27 +69273,27 @@ - (void)subscribeAttributeThermostatRunningModeWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeThermostatRunningModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeThermostatRunningModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeThermostatRunningModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeStartOfWeekWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartOfWeekWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeStartOfWeekWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -69308,27 +69308,27 @@ - (void)subscribeAttributeStartOfWeekWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStartOfWeekWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeStartOfWeekWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartOfWeekWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfWeeklyTransitionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfWeeklyTransitionsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfWeeklyTransitionsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                             params:(MTRSubscribeParams * _Nullable)params
@@ -69343,27 +69343,27 @@ - (void)subscribeAttributeNumberOfWeeklyTransitionsWithMinInterval:(NSNumber * _
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfWeeklyTransitionsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfWeeklyTransitionsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfWeeklyTransitionsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfDailyTransitionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfDailyTransitionsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfDailyTransitionsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                            params:(MTRSubscribeParams * _Nullable)params
@@ -69378,27 +69378,27 @@ - (void)subscribeAttributeNumberOfDailyTransitionsWithMinInterval:(NSNumber * _N
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfDailyTransitionsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfDailyTransitionsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfDailyTransitionsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTemperatureSetpointHoldWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTemperatureSetpointHoldWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeTemperatureSetpointHoldWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69421,27 +69421,27 @@ - (void)subscribeAttributeTemperatureSetpointHoldWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTemperatureSetpointHoldWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTemperatureSetpointHoldWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTemperatureSetpointHoldWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeTemperatureSetpointHoldDurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTemperatureSetpointHoldDurationWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeTemperatureSetpointHoldDurationWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69464,27 +69464,27 @@ - (void)subscribeAttributeTemperatureSetpointHoldDurationWithMinInterval:(NSNumb
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTemperatureSetpointHoldDurationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTemperatureSetpointHoldDurationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTemperatureSetpointHoldDurationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeThermostatProgrammingOperationModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeThermostatProgrammingOperationModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeThermostatProgrammingOperationModeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69507,27 +69507,27 @@ - (void)subscribeAttributeThermostatProgrammingOperationModeWithMinInterval:(NSN
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeThermostatProgrammingOperationModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeThermostatProgrammingOperationModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeThermostatProgrammingOperationModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeThermostatRunningStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeThermostatRunningStateWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeThermostatRunningStateWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -69542,27 +69542,27 @@ - (void)subscribeAttributeThermostatRunningStateWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeThermostatRunningStateWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeThermostatRunningStateWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeThermostatRunningStateWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSetpointChangeSourceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSetpointChangeSourceWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSetpointChangeSourceWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -69577,27 +69577,27 @@ - (void)subscribeAttributeSetpointChangeSourceWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSetpointChangeSourceWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSetpointChangeSourceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSetpointChangeSourceWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSetpointChangeAmountWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSetpointChangeAmountWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSetpointChangeAmountWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -69612,27 +69612,27 @@ - (void)subscribeAttributeSetpointChangeAmountWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSetpointChangeAmountWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSetpointChangeAmountWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSetpointChangeAmountWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSetpointChangeSourceTimestampWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSetpointChangeSourceTimestampWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSetpointChangeSourceTimestampWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -69647,27 +69647,27 @@ - (void)subscribeAttributeSetpointChangeSourceTimestampWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSetpointChangeSourceTimestampWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSetpointChangeSourceTimestampWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSetpointChangeSourceTimestampWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupiedSetbackWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69690,27 +69690,27 @@ - (void)subscribeAttributeOccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOccupiedSetbackWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOccupiedSetbackWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupiedSetbackWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupiedSetbackMinWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -69725,27 +69725,27 @@ - (void)subscribeAttributeOccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOccupiedSetbackMinWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOccupiedSetbackMinWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupiedSetbackMinWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupiedSetbackMaxWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -69760,27 +69760,27 @@ - (void)subscribeAttributeOccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOccupiedSetbackMaxWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOccupiedSetbackMaxWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupiedSetbackMaxWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUnoccupiedSetbackWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnoccupiedSetbackWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeUnoccupiedSetbackWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69803,27 +69803,27 @@ - (void)subscribeAttributeUnoccupiedSetbackWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUnoccupiedSetbackWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUnoccupiedSetbackWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnoccupiedSetbackWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUnoccupiedSetbackMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnoccupiedSetbackMinWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeUnoccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -69838,27 +69838,27 @@ - (void)subscribeAttributeUnoccupiedSetbackMinWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUnoccupiedSetbackMinWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUnoccupiedSetbackMinWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnoccupiedSetbackMinWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUnoccupiedSetbackMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnoccupiedSetbackMaxWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -69873,27 +69873,27 @@ - (void)subscribeAttributeUnoccupiedSetbackMaxWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUnoccupiedSetbackMaxWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUnoccupiedSetbackMaxWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnoccupiedSetbackMaxWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEmergencyHeatDeltaWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEmergencyHeatDeltaWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeEmergencyHeatDeltaWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69916,27 +69916,27 @@ - (void)subscribeAttributeEmergencyHeatDeltaWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEmergencyHeatDeltaWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEmergencyHeatDeltaWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEmergencyHeatDeltaWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeACTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeACTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -69959,27 +69959,27 @@ - (void)subscribeAttributeACTypeWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeACTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeACTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeACCapacityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACCapacityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeACCapacityWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -70002,27 +70002,27 @@ - (void)subscribeAttributeACCapacityWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeACCapacityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeACCapacityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACCapacityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeACRefrigerantTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACRefrigerantTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeACRefrigerantTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -70045,27 +70045,27 @@ - (void)subscribeAttributeACRefrigerantTypeWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeACRefrigerantTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeACRefrigerantTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACRefrigerantTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeACCompressorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACCompressorTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeACCompressorTypeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -70088,27 +70088,27 @@ - (void)subscribeAttributeACCompressorTypeWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeACCompressorTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeACCompressorTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACCompressorTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeACErrorCodeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACErrorCodeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeACErrorCodeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -70131,27 +70131,27 @@ - (void)subscribeAttributeACErrorCodeWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeACErrorCodeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeACErrorCodeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACErrorCodeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeACLouverPositionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACLouverPositionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeACLouverPositionWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -70174,27 +70174,27 @@ - (void)subscribeAttributeACLouverPositionWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeACLouverPositionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeACLouverPositionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACLouverPositionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeACCoilTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACCoilTemperatureWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeACCoilTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -70209,27 +70209,27 @@ - (void)subscribeAttributeACCoilTemperatureWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeACCoilTemperatureWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeACCoilTemperatureWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACCoilTemperatureWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeACCapacityformatWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACCapacityformatWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeACCapacityformatWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -70252,27 +70252,27 @@ - (void)subscribeAttributeACCapacityformatWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeACCapacityformatWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeACCapacityformatWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeACCapacityformatWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -70287,27 +70287,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -70322,27 +70322,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -70357,27 +70357,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -70392,27 +70392,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -70427,18 +70427,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -71338,10 +71338,10 @@ @implementation MTRBaseClusterFanControl (Deprecated)
 - (void)readAttributeFanModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFanModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeFanModeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -71364,27 +71364,27 @@ - (void)subscribeAttributeFanModeWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFanModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFanModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFanModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeFanModeSequenceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFanModeSequenceWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeFanModeSequenceWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -71407,27 +71407,27 @@ - (void)subscribeAttributeFanModeSequenceWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFanModeSequenceWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFanModeSequenceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFanModeSequenceWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePercentSettingWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePercentSettingWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributePercentSettingWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -71450,27 +71450,27 @@ - (void)subscribeAttributePercentSettingWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePercentSettingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePercentSettingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePercentSettingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePercentCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePercentCurrentWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePercentCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -71485,27 +71485,27 @@ - (void)subscribeAttributePercentCurrentWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePercentCurrentWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePercentCurrentWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePercentCurrentWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSpeedMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSpeedMaxWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSpeedMaxWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -71520,27 +71520,27 @@ - (void)subscribeAttributeSpeedMaxWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSpeedMaxWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSpeedMaxWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSpeedMaxWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSpeedSettingWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSpeedSettingWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeSpeedSettingWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -71563,27 +71563,27 @@ - (void)subscribeAttributeSpeedSettingWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSpeedSettingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSpeedSettingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSpeedSettingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSpeedCurrentWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSpeedCurrentWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSpeedCurrentWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -71598,27 +71598,27 @@ - (void)subscribeAttributeSpeedCurrentWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSpeedCurrentWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSpeedCurrentWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSpeedCurrentWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRockSupportWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRockSupportWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRockSupportWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -71633,27 +71633,27 @@ - (void)subscribeAttributeRockSupportWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRockSupportWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRockSupportWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRockSupportWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRockSettingWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRockSettingWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeRockSettingWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -71676,27 +71676,27 @@ - (void)subscribeAttributeRockSettingWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRockSettingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRockSettingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRockSettingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWindSupportWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWindSupportWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeWindSupportWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -71711,27 +71711,27 @@ - (void)subscribeAttributeWindSupportWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWindSupportWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWindSupportWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWindSupportWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWindSettingWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWindSettingWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeWindSettingWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -71754,27 +71754,27 @@ - (void)subscribeAttributeWindSettingWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWindSettingWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWindSettingWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWindSettingWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -71789,27 +71789,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -71824,27 +71824,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -71859,27 +71859,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -71894,27 +71894,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -71929,18 +71929,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -72369,10 +72369,10 @@ @implementation MTRBaseClusterThermostatUserInterfaceConfiguration (Deprecated)
 - (void)readAttributeTemperatureDisplayModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTemperatureDisplayModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeTemperatureDisplayModeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -72395,27 +72395,27 @@ - (void)subscribeAttributeTemperatureDisplayModeWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTemperatureDisplayModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTemperatureDisplayModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTemperatureDisplayModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeKeypadLockoutWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeKeypadLockoutWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeKeypadLockoutWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -72438,27 +72438,27 @@ - (void)subscribeAttributeKeypadLockoutWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeKeypadLockoutWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeKeypadLockoutWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeKeypadLockoutWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeScheduleProgrammingVisibilityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeScheduleProgrammingVisibilityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeScheduleProgrammingVisibilityWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -72481,27 +72481,27 @@ - (void)subscribeAttributeScheduleProgrammingVisibilityWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeScheduleProgrammingVisibilityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeScheduleProgrammingVisibilityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeScheduleProgrammingVisibilityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -72516,27 +72516,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -72551,27 +72551,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -72586,27 +72586,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -72621,27 +72621,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -72656,18 +72656,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -75617,106 +75617,106 @@ @implementation MTRBaseClusterColorControl (Deprecated)
 - (void)moveToHueWithParams:(MTRColorControlClusterMoveToHueParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToHueWithParams:params completion:
-                                         completionHandler];
+            completionHandler];
 }
 - (void)moveHueWithParams:(MTRColorControlClusterMoveHueParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveHueWithParams:params completion:
-                                       completionHandler];
+            completionHandler];
 }
 - (void)stepHueWithParams:(MTRColorControlClusterStepHueParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepHueWithParams:params completion:
-                                       completionHandler];
+            completionHandler];
 }
 - (void)moveToSaturationWithParams:(MTRColorControlClusterMoveToSaturationParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToSaturationWithParams:params completion:
-                                                completionHandler];
+            completionHandler];
 }
 - (void)moveSaturationWithParams:(MTRColorControlClusterMoveSaturationParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveSaturationWithParams:params completion:
-                                              completionHandler];
+            completionHandler];
 }
 - (void)stepSaturationWithParams:(MTRColorControlClusterStepSaturationParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepSaturationWithParams:params completion:
-                                              completionHandler];
+            completionHandler];
 }
 - (void)moveToHueAndSaturationWithParams:(MTRColorControlClusterMoveToHueAndSaturationParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToHueAndSaturationWithParams:params completion:
-                                                      completionHandler];
+            completionHandler];
 }
 - (void)moveToColorWithParams:(MTRColorControlClusterMoveToColorParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToColorWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 - (void)moveColorWithParams:(MTRColorControlClusterMoveColorParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveColorWithParams:params completion:
-                                         completionHandler];
+            completionHandler];
 }
 - (void)stepColorWithParams:(MTRColorControlClusterStepColorParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepColorWithParams:params completion:
-                                         completionHandler];
+            completionHandler];
 }
 - (void)moveToColorTemperatureWithParams:(MTRColorControlClusterMoveToColorTemperatureParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToColorTemperatureWithParams:params completion:
-                                                      completionHandler];
+            completionHandler];
 }
 - (void)enhancedMoveToHueWithParams:(MTRColorControlClusterEnhancedMoveToHueParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enhancedMoveToHueWithParams:params completion:
-                                                 completionHandler];
+            completionHandler];
 }
 - (void)enhancedMoveHueWithParams:(MTRColorControlClusterEnhancedMoveHueParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enhancedMoveHueWithParams:params completion:
-                                               completionHandler];
+            completionHandler];
 }
 - (void)enhancedStepHueWithParams:(MTRColorControlClusterEnhancedStepHueParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enhancedStepHueWithParams:params completion:
-                                               completionHandler];
+            completionHandler];
 }
 - (void)enhancedMoveToHueAndSaturationWithParams:(MTRColorControlClusterEnhancedMoveToHueAndSaturationParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enhancedMoveToHueAndSaturationWithParams:params completion:
-                                                              completionHandler];
+            completionHandler];
 }
 - (void)colorLoopSetWithParams:(MTRColorControlClusterColorLoopSetParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self colorLoopSetWithParams:params completion:
-                                            completionHandler];
+            completionHandler];
 }
 - (void)stopMoveStepWithParams:(MTRColorControlClusterStopMoveStepParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stopMoveStepWithParams:params completion:
-                                            completionHandler];
+            completionHandler];
 }
 - (void)moveColorTemperatureWithParams:(MTRColorControlClusterMoveColorTemperatureParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveColorTemperatureWithParams:params completion:
-                                                    completionHandler];
+            completionHandler];
 }
 - (void)stepColorTemperatureWithParams:(MTRColorControlClusterStepColorTemperatureParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepColorTemperatureWithParams:params completion:
-                                                    completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeCurrentHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentHueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentHueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -75731,27 +75731,27 @@ - (void)subscribeAttributeCurrentHueWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentHueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentHueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentHueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentSaturationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentSaturationWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentSaturationWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -75766,27 +75766,27 @@ - (void)subscribeAttributeCurrentSaturationWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentSaturationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentSaturationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentSaturationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRemainingTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRemainingTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -75801,27 +75801,27 @@ - (void)subscribeAttributeRemainingTimeWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRemainingTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRemainingTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRemainingTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentXWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentXWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentXWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -75836,27 +75836,27 @@ - (void)subscribeAttributeCurrentXWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentXWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentXWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentXWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentYWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentYWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentYWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -75871,27 +75871,27 @@ - (void)subscribeAttributeCurrentYWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentYWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentYWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentYWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeDriftCompensationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDriftCompensationWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeDriftCompensationWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -75906,27 +75906,27 @@ - (void)subscribeAttributeDriftCompensationWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDriftCompensationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeDriftCompensationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDriftCompensationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCompensationTextWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCompensationTextWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCompensationTextWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -75941,27 +75941,27 @@ - (void)subscribeAttributeCompensationTextWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCompensationTextWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                  }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeCompensationTextWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCompensationTextWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                     }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorTemperatureMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorTemperatureMiredsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeColorTemperatureMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                          params:(MTRSubscribeParams * _Nullable)params
@@ -75976,27 +75976,27 @@ - (void)subscribeAttributeColorTemperatureMiredsWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorTemperatureMiredsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorTemperatureMiredsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorTemperatureMiredsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeColorModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76011,27 +76011,27 @@ - (void)subscribeAttributeColorModeWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOptionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOptionsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -76054,27 +76054,27 @@ - (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOptionsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOptionsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOptionsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNumberOfPrimariesWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfPrimariesWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeNumberOfPrimariesWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -76089,27 +76089,27 @@ - (void)subscribeAttributeNumberOfPrimariesWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNumberOfPrimariesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNumberOfPrimariesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNumberOfPrimariesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary1XWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary1XWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary1XWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76124,27 +76124,27 @@ - (void)subscribeAttributePrimary1XWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary1XWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary1XWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary1XWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary1YWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary1YWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary1YWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76159,27 +76159,27 @@ - (void)subscribeAttributePrimary1YWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary1YWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary1YWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary1YWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary1IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary1IntensityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary1IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -76194,27 +76194,27 @@ - (void)subscribeAttributePrimary1IntensityWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary1IntensityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary1IntensityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary1IntensityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary2XWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary2XWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary2XWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76229,27 +76229,27 @@ - (void)subscribeAttributePrimary2XWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary2XWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary2XWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary2XWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary2YWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary2YWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary2YWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76264,27 +76264,27 @@ - (void)subscribeAttributePrimary2YWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary2YWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary2YWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary2YWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary2IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary2IntensityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary2IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -76299,27 +76299,27 @@ - (void)subscribeAttributePrimary2IntensityWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary2IntensityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary2IntensityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary2IntensityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary3XWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary3XWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary3XWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76334,27 +76334,27 @@ - (void)subscribeAttributePrimary3XWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary3XWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary3XWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary3XWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary3YWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary3YWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary3YWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76369,27 +76369,27 @@ - (void)subscribeAttributePrimary3YWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary3YWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary3YWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary3YWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary3IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary3IntensityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary3IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -76404,27 +76404,27 @@ - (void)subscribeAttributePrimary3IntensityWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary3IntensityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary3IntensityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary3IntensityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary4XWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary4XWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary4XWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76439,27 +76439,27 @@ - (void)subscribeAttributePrimary4XWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary4XWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary4XWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary4XWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary4YWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary4YWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary4YWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76474,27 +76474,27 @@ - (void)subscribeAttributePrimary4YWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary4YWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary4YWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary4YWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary4IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary4IntensityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary4IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -76509,27 +76509,27 @@ - (void)subscribeAttributePrimary4IntensityWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary4IntensityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary4IntensityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary4IntensityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary5XWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary5XWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary5XWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76544,27 +76544,27 @@ - (void)subscribeAttributePrimary5XWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary5XWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary5XWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary5XWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary5YWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary5YWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary5YWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76579,27 +76579,27 @@ - (void)subscribeAttributePrimary5YWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary5YWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary5YWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary5YWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary5IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary5IntensityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary5IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -76614,27 +76614,27 @@ - (void)subscribeAttributePrimary5IntensityWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary5IntensityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary5IntensityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary5IntensityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary6XWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary6XWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary6XWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76649,27 +76649,27 @@ - (void)subscribeAttributePrimary6XWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary6XWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary6XWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary6XWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary6YWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary6YWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary6YWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -76684,27 +76684,27 @@ - (void)subscribeAttributePrimary6YWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary6YWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary6YWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary6YWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePrimary6IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary6IntensityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePrimary6IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -76719,27 +76719,27 @@ - (void)subscribeAttributePrimary6IntensityWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePrimary6IntensityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePrimary6IntensityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePrimary6IntensityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWhitePointXWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWhitePointXWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeWhitePointXWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -76762,27 +76762,27 @@ - (void)subscribeAttributeWhitePointXWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWhitePointXWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWhitePointXWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWhitePointXWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWhitePointYWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWhitePointYWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeWhitePointYWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -76805,27 +76805,27 @@ - (void)subscribeAttributeWhitePointYWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWhitePointYWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWhitePointYWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWhitePointYWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorPointRXWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointRXWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeColorPointRXWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -76848,27 +76848,27 @@ - (void)subscribeAttributeColorPointRXWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorPointRXWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorPointRXWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointRXWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorPointRYWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointRYWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeColorPointRYWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -76891,27 +76891,27 @@ - (void)subscribeAttributeColorPointRYWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorPointRYWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorPointRYWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointRYWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorPointRIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointRIntensityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -76934,27 +76934,27 @@ - (void)subscribeAttributeColorPointRIntensityWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorPointRIntensityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorPointRIntensityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointRIntensityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorPointGXWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointGXWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeColorPointGXWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -76977,27 +76977,27 @@ - (void)subscribeAttributeColorPointGXWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorPointGXWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorPointGXWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointGXWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorPointGYWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointGYWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeColorPointGYWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -77020,27 +77020,27 @@ - (void)subscribeAttributeColorPointGYWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorPointGYWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorPointGYWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointGYWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorPointGIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointGIntensityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -77063,27 +77063,27 @@ - (void)subscribeAttributeColorPointGIntensityWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorPointGIntensityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorPointGIntensityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointGIntensityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorPointBXWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointBXWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeColorPointBXWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -77106,27 +77106,27 @@ - (void)subscribeAttributeColorPointBXWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorPointBXWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorPointBXWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointBXWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorPointBYWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointBYWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeColorPointBYWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -77149,27 +77149,27 @@ - (void)subscribeAttributeColorPointBYWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorPointBYWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorPointBYWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointBYWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorPointBIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointBIntensityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -77192,27 +77192,27 @@ - (void)subscribeAttributeColorPointBIntensityWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorPointBIntensityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorPointBIntensityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorPointBIntensityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEnhancedCurrentHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnhancedCurrentHueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeEnhancedCurrentHueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -77227,27 +77227,27 @@ - (void)subscribeAttributeEnhancedCurrentHueWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEnhancedCurrentHueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEnhancedCurrentHueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnhancedCurrentHueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEnhancedColorModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnhancedColorModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeEnhancedColorModeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -77262,27 +77262,27 @@ - (void)subscribeAttributeEnhancedColorModeWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEnhancedColorModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEnhancedColorModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnhancedColorModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorLoopActiveWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorLoopActiveWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeColorLoopActiveWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -77297,27 +77297,27 @@ - (void)subscribeAttributeColorLoopActiveWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorLoopActiveWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorLoopActiveWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorLoopActiveWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorLoopDirectionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorLoopDirectionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeColorLoopDirectionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -77332,27 +77332,27 @@ - (void)subscribeAttributeColorLoopDirectionWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorLoopDirectionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorLoopDirectionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorLoopDirectionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorLoopTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorLoopTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeColorLoopTimeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -77367,27 +77367,27 @@ - (void)subscribeAttributeColorLoopTimeWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorLoopTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorLoopTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorLoopTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorLoopStartEnhancedHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorLoopStartEnhancedHueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeColorLoopStartEnhancedHueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                             params:(MTRSubscribeParams * _Nullable)params
@@ -77402,27 +77402,27 @@ - (void)subscribeAttributeColorLoopStartEnhancedHueWithMinInterval:(NSNumber * _
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorLoopStartEnhancedHueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorLoopStartEnhancedHueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorLoopStartEnhancedHueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorLoopStoredEnhancedHueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorLoopStoredEnhancedHueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeColorLoopStoredEnhancedHueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                              params:(MTRSubscribeParams * _Nullable)params
@@ -77437,27 +77437,27 @@ - (void)subscribeAttributeColorLoopStoredEnhancedHueWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorLoopStoredEnhancedHueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorLoopStoredEnhancedHueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorLoopStoredEnhancedHueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorCapabilitiesWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorCapabilitiesWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeColorCapabilitiesWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -77472,27 +77472,27 @@ - (void)subscribeAttributeColorCapabilitiesWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorCapabilitiesWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorCapabilitiesWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorCapabilitiesWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorTempPhysicalMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorTempPhysicalMinMiredsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeColorTempPhysicalMinMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                              params:(MTRSubscribeParams * _Nullable)params
@@ -77507,27 +77507,27 @@ - (void)subscribeAttributeColorTempPhysicalMinMiredsWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorTempPhysicalMinMiredsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorTempPhysicalMinMiredsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorTempPhysicalMinMiredsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeColorTempPhysicalMaxMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorTempPhysicalMaxMiredsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeColorTempPhysicalMaxMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                              params:(MTRSubscribeParams * _Nullable)params
@@ -77542,27 +77542,27 @@ - (void)subscribeAttributeColorTempPhysicalMaxMiredsWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeColorTempPhysicalMaxMiredsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeColorTempPhysicalMaxMiredsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeColorTempPhysicalMaxMiredsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeCoupleColorTempToLevelMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCoupleColorTempToLevelMinMiredsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCoupleColorTempToLevelMinMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -77577,27 +77577,27 @@ - (void)subscribeAttributeCoupleColorTempToLevelMinMiredsWithMinInterval:(NSNumb
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCoupleColorTempToLevelMinMiredsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCoupleColorTempToLevelMinMiredsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCoupleColorTempToLevelMinMiredsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeStartUpColorTemperatureMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartUpColorTemperatureMiredsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeStartUpColorTemperatureMiredsWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -77620,27 +77620,27 @@ - (void)subscribeAttributeStartUpColorTemperatureMiredsWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStartUpColorTemperatureMiredsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeStartUpColorTemperatureMiredsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartUpColorTemperatureMiredsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -77655,27 +77655,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -77690,27 +77690,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -77725,27 +77725,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -77760,27 +77760,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -77795,18 +77795,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -78852,10 +78852,10 @@ @implementation MTRBaseClusterBallastConfiguration (Deprecated)
 - (void)readAttributePhysicalMinLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalMinLevelWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePhysicalMinLevelWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -78870,27 +78870,27 @@ - (void)subscribeAttributePhysicalMinLevelWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePhysicalMinLevelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePhysicalMinLevelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalMinLevelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePhysicalMaxLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalMaxLevelWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePhysicalMaxLevelWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -78905,27 +78905,27 @@ - (void)subscribeAttributePhysicalMaxLevelWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePhysicalMaxLevelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePhysicalMaxLevelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalMaxLevelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBallastStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBallastStatusWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeBallastStatusWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -78940,27 +78940,27 @@ - (void)subscribeAttributeBallastStatusWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBallastStatusWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBallastStatusWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBallastStatusWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinLevelWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeMinLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -78983,27 +78983,27 @@ - (void)subscribeAttributeMinLevelWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinLevelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinLevelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinLevelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxLevelWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxLevelWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeMaxLevelWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -79026,27 +79026,27 @@ - (void)subscribeAttributeMaxLevelWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxLevelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxLevelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxLevelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeIntrinsicBalanceFactorWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeIntrinsicBallastFactorWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeIntrinsicBalanceFactorWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -79069,27 +79069,27 @@ - (void)subscribeAttributeIntrinsicBalanceFactorWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeIntrinsicBallastFactorWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeIntrinsicBalanceFactorWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeIntrinsicBallastFactorWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBallastFactorAdjustmentWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBallastFactorAdjustmentWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeBallastFactorAdjustmentWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -79112,27 +79112,27 @@ - (void)subscribeAttributeBallastFactorAdjustmentWithMinInterval:(NSNumber * _No
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBallastFactorAdjustmentWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBallastFactorAdjustmentWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBallastFactorAdjustmentWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLampQuantityWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampQuantityWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLampQuantityWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -79147,27 +79147,27 @@ - (void)subscribeAttributeLampQuantityWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLampQuantityWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLampQuantityWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampQuantityWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLampTypeWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampTypeWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)writeAttributeLampTypeWithValue:(NSString * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -79190,27 +79190,27 @@ - (void)subscribeAttributeLampTypeWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLampTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                          }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeLampTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                             }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeLampManufacturerWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampManufacturerWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)writeAttributeLampManufacturerWithValue:(NSString * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -79233,27 +79233,27 @@ - (void)subscribeAttributeLampManufacturerWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLampManufacturerWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                  }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeLampManufacturerWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampManufacturerWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                     }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeLampRatedHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampRatedHoursWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeLampRatedHoursWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -79276,27 +79276,27 @@ - (void)subscribeAttributeLampRatedHoursWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLampRatedHoursWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLampRatedHoursWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampRatedHoursWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLampBurnHoursWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampBurnHoursWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeLampBurnHoursWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -79319,27 +79319,27 @@ - (void)subscribeAttributeLampBurnHoursWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLampBurnHoursWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLampBurnHoursWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampBurnHoursWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLampAlarmModeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampAlarmModeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeLampAlarmModeWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -79362,27 +79362,27 @@ - (void)subscribeAttributeLampAlarmModeWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLampAlarmModeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLampAlarmModeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampAlarmModeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLampBurnHoursTripPointWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampBurnHoursTripPointWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeLampBurnHoursTripPointWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -79405,27 +79405,27 @@ - (void)subscribeAttributeLampBurnHoursTripPointWithMinInterval:(NSNumber * _Non
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLampBurnHoursTripPointWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLampBurnHoursTripPointWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLampBurnHoursTripPointWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -79440,27 +79440,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -79475,27 +79475,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -79510,27 +79510,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -79545,27 +79545,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -79580,18 +79580,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -80008,10 +80008,10 @@ @implementation MTRBaseClusterIlluminanceMeasurement (Deprecated)
 - (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -80026,27 +80026,27 @@ - (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -80061,27 +80061,27 @@ - (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -80096,27 +80096,27 @@ - (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeToleranceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeToleranceWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -80131,27 +80131,27 @@ - (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeToleranceWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeToleranceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeToleranceWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeLightSensorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLightSensorTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLightSensorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -80166,27 +80166,27 @@ - (void)subscribeAttributeLightSensorTypeWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLightSensorTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeLightSensorTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLightSensorTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -80201,27 +80201,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -80236,27 +80236,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -80271,27 +80271,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -80306,27 +80306,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -80341,18 +80341,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -80733,10 +80733,10 @@ @implementation MTRBaseClusterTemperatureMeasurement (Deprecated)
 - (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -80751,27 +80751,27 @@ - (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -80786,27 +80786,27 @@ - (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -80821,27 +80821,27 @@ - (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeToleranceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeToleranceWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -80856,27 +80856,27 @@ - (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeToleranceWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeToleranceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeToleranceWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -80891,27 +80891,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -80926,27 +80926,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -80961,27 +80961,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -80996,27 +80996,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -81031,18 +81031,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -81603,10 +81603,10 @@ @implementation MTRBaseClusterPressureMeasurement (Deprecated)
 - (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -81621,27 +81621,27 @@ - (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -81656,27 +81656,27 @@ - (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -81691,27 +81691,27 @@ - (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeToleranceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeToleranceWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -81726,27 +81726,27 @@ - (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeToleranceWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeToleranceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeToleranceWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeScaledValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeScaledValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -81761,27 +81761,27 @@ - (void)subscribeAttributeScaledValueWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeScaledValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeScaledValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeScaledValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinScaledValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinScaledValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -81796,27 +81796,27 @@ - (void)subscribeAttributeMinScaledValueWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinScaledValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinScaledValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinScaledValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxScaledValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxScaledValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxScaledValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -81831,27 +81831,27 @@ - (void)subscribeAttributeMaxScaledValueWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxScaledValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxScaledValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxScaledValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeScaledToleranceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeScaledToleranceWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeScaledToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -81866,27 +81866,27 @@ - (void)subscribeAttributeScaledToleranceWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeScaledToleranceWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeScaledToleranceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeScaledToleranceWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeScaleWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeScaleWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeScaleWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                         params:(MTRSubscribeParams * _Nullable)params
@@ -81901,27 +81901,27 @@ - (void)subscribeAttributeScaleWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeScaleWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeScaleWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeScaleWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -81936,27 +81936,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -81971,27 +81971,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -82006,27 +82006,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -82041,27 +82041,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -82076,18 +82076,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -82468,10 +82468,10 @@ @implementation MTRBaseClusterFlowMeasurement (Deprecated)
 - (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -82486,27 +82486,27 @@ - (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -82521,27 +82521,27 @@ - (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -82556,27 +82556,27 @@ - (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeToleranceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeToleranceWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -82591,27 +82591,27 @@ - (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeToleranceWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeToleranceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeToleranceWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -82626,27 +82626,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -82661,27 +82661,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -82696,27 +82696,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -82731,27 +82731,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -82766,18 +82766,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -83158,10 +83158,10 @@ @implementation MTRBaseClusterRelativeHumidityMeasurement (Deprecated)
 - (void)readAttributeMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -83176,27 +83176,27 @@ - (void)subscribeAttributeMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMinMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -83211,27 +83211,27 @@ - (void)subscribeAttributeMinMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMinMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMinMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMinMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeMaxMeasuredValueWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxMeasuredValueWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                    params:(MTRSubscribeParams * _Nullable)params
@@ -83246,27 +83246,27 @@ - (void)subscribeAttributeMaxMeasuredValueWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMaxMeasuredValueWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeMaxMeasuredValueWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMaxMeasuredValueWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeToleranceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeToleranceWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -83281,27 +83281,27 @@ - (void)subscribeAttributeToleranceWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeToleranceWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeToleranceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeToleranceWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -83316,27 +83316,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -83351,27 +83351,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -83386,27 +83386,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -83421,27 +83421,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -83456,18 +83456,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -84488,10 +84488,10 @@ @implementation MTRBaseClusterOccupancySensing (Deprecated)
 - (void)readAttributeOccupancyWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupancyWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -84506,27 +84506,27 @@ - (void)subscribeAttributeOccupancyWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOccupancyWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOccupancyWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupancyWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOccupancySensorTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupancySensorTypeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOccupancySensorTypeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -84541,27 +84541,27 @@ - (void)subscribeAttributeOccupancySensorTypeWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOccupancySensorTypeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOccupancySensorTypeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupancySensorTypeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOccupancySensorTypeBitmapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupancySensorTypeBitmapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOccupancySensorTypeBitmapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                             params:(MTRSubscribeParams * _Nullable)params
@@ -84576,27 +84576,27 @@ - (void)subscribeAttributeOccupancySensorTypeBitmapWithMinInterval:(NSNumber * _
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOccupancySensorTypeBitmapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeOccupancySensorTypeBitmapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOccupancySensorTypeBitmapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePirOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePIROccupiedToUnoccupiedDelayWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributePirOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -84619,27 +84619,27 @@ - (void)subscribeAttributePirOccupiedToUnoccupiedDelayWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePIROccupiedToUnoccupiedDelayWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePirOccupiedToUnoccupiedDelayWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePIROccupiedToUnoccupiedDelayWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePirUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePIRUnoccupiedToOccupiedDelayWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributePirUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -84662,27 +84662,27 @@ - (void)subscribeAttributePirUnoccupiedToOccupiedDelayWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePIRUnoccupiedToOccupiedDelayWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePirUnoccupiedToOccupiedDelayWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePIRUnoccupiedToOccupiedDelayWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePirUnoccupiedToOccupiedThresholdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePIRUnoccupiedToOccupiedThresholdWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributePirUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -84705,27 +84705,27 @@ - (void)subscribeAttributePirUnoccupiedToOccupiedThresholdWithMinInterval:(NSNum
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePIRUnoccupiedToOccupiedThresholdWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePirUnoccupiedToOccupiedThresholdWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePIRUnoccupiedToOccupiedThresholdWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUltrasonicOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUltrasonicOccupiedToUnoccupiedDelayWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeUltrasonicOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -84748,27 +84748,27 @@ - (void)subscribeAttributeUltrasonicOccupiedToUnoccupiedDelayWithMinInterval:(NS
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUltrasonicOccupiedToUnoccupiedDelayWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUltrasonicOccupiedToUnoccupiedDelayWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUltrasonicOccupiedToUnoccupiedDelayWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUltrasonicUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUltrasonicUnoccupiedToOccupiedDelayWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeUltrasonicUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -84791,27 +84791,27 @@ - (void)subscribeAttributeUltrasonicUnoccupiedToOccupiedDelayWithMinInterval:(NS
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUltrasonicUnoccupiedToOccupiedDelayWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUltrasonicUnoccupiedToOccupiedDelayWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUltrasonicUnoccupiedToOccupiedDelayWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -84834,27 +84834,27 @@ - (void)subscribeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithMinInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUltrasonicUnoccupiedToOccupiedThresholdWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUltrasonicUnoccupiedToOccupiedThresholdWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalContactOccupiedToUnoccupiedDelayWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributePhysicalContactOccupiedToUnoccupiedDelayWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -84877,27 +84877,27 @@ - (void)subscribeAttributePhysicalContactOccupiedToUnoccupiedDelayWithMinInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePhysicalContactOccupiedToUnoccupiedDelayWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePhysicalContactOccupiedToUnoccupiedDelayWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalContactOccupiedToUnoccupiedDelayWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalContactUnoccupiedToOccupiedDelayWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributePhysicalContactUnoccupiedToOccupiedDelayWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -84920,27 +84920,27 @@ - (void)subscribeAttributePhysicalContactUnoccupiedToOccupiedDelayWithMinInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePhysicalContactUnoccupiedToOccupiedDelayWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePhysicalContactUnoccupiedToOccupiedDelayWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalContactUnoccupiedToOccupiedDelayWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -84963,27 +84963,27 @@ - (void)subscribeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithMinInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePhysicalContactUnoccupiedToOccupiedThresholdWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePhysicalContactUnoccupiedToOccupiedThresholdWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -84998,27 +84998,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -85033,27 +85033,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -85068,27 +85068,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -85103,27 +85103,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -85138,18 +85138,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -92923,10 +92923,10 @@ @implementation MTRBaseClusterWakeOnLan (Deprecated)
 - (void)readAttributeMACAddressWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMACAddressWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeMACAddressWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -92941,27 +92941,27 @@ - (void)subscribeAttributeMACAddressWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeMACAddressWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                            }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeMACAddressWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeMACAddressWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                               }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -92976,27 +92976,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -93011,27 +93011,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -93046,27 +93046,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -93081,27 +93081,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -93116,18 +93116,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -93621,29 +93621,29 @@ @implementation MTRBaseClusterChannel (Deprecated)
 - (void)changeChannelWithParams:(MTRChannelClusterChangeChannelParams *)params completionHandler:(void (^)(MTRChannelClusterChangeChannelResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self changeChannelWithParams:params completion:
-                                             ^(MTRChannelClusterChangeChannelResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                 // Cast is safe because subclass does not add any selectors.
-                                                 completionHandler(static_cast<MTRChannelClusterChangeChannelResponseParams *>(data), error);
-                                             }];
+            ^(MTRChannelClusterChangeChannelResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRChannelClusterChangeChannelResponseParams *>(data), error);
+            }];
 }
 - (void)changeChannelByNumberWithParams:(MTRChannelClusterChangeChannelByNumberParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self changeChannelByNumberWithParams:params completion:
-                                                     completionHandler];
+            completionHandler];
 }
 - (void)skipChannelWithParams:(MTRChannelClusterSkipChannelParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self skipChannelWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeChannelListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeChannelListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeChannelListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -93658,27 +93658,27 @@ - (void)subscribeAttributeChannelListWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeChannelListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                             }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeChannelListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeChannelListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeLineupWithCompletionHandler:(void (^)(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLineupWithCompletion:
-              ^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<MTRChannelClusterLineupInfo *>(value), error);
-              }];
+            ^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRChannelClusterLineupInfo *>(value), error);
+            }];
 }
 - (void)subscribeAttributeLineupWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                          params:(MTRSubscribeParams * _Nullable)params
@@ -93693,27 +93693,27 @@ - (void)subscribeAttributeLineupWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLineupWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<MTRChannelClusterLineupInfo *>(value), error);
-                                                                                                                        }];
+            ^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<MTRChannelClusterLineupInfo *>(value), error);
+            }];
 }
 + (void)readAttributeLineupWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(MTRChannelClusterLineupInfo * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLineupWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<MTRChannelClusterLineupInfo *>(value), error);
-                                                                                                                           }];
+            ^(MTRChannelClusterLineupInfoStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRChannelClusterLineupInfo *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentChannelWithCompletionHandler:(void (^)(MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentChannelWithCompletion:
-              ^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<MTRChannelClusterChannelInfo *>(value), error);
-              }];
+            ^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRChannelClusterChannelInfo *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentChannelWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -93728,27 +93728,27 @@ - (void)subscribeAttributeCurrentChannelWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentChannelWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<MTRChannelClusterChannelInfo *>(value), error);
-                                                                                                                                }];
+            ^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<MTRChannelClusterChannelInfo *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentChannelWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(MTRChannelClusterChannelInfo * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentChannelWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<MTRChannelClusterChannelInfo *>(value), error);
-                                                                                                                                   }];
+            ^(MTRChannelClusterChannelInfoStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRChannelClusterChannelInfo *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -93763,27 +93763,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -93798,27 +93798,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -93833,27 +93833,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -93868,27 +93868,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -93903,18 +93903,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -94248,19 +94248,19 @@ @implementation MTRBaseClusterTargetNavigator (Deprecated)
 - (void)navigateTargetWithParams:(MTRTargetNavigatorClusterNavigateTargetParams *)params completionHandler:(void (^)(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self navigateTargetWithParams:params completion:
-                                              ^(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                  // Cast is safe because subclass does not add any selectors.
-                                                  completionHandler(static_cast<MTRTargetNavigatorClusterNavigateTargetResponseParams *>(data), error);
-                                              }];
+            ^(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTargetNavigatorClusterNavigateTargetResponseParams *>(data), error);
+            }];
 }
 
 - (void)readAttributeTargetListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTargetListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeTargetListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -94275,27 +94275,27 @@ - (void)subscribeAttributeTargetListWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTargetListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeTargetListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTargetListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentTargetWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentTargetWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentTargetWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -94310,27 +94310,27 @@ - (void)subscribeAttributeCurrentTargetWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentTargetWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentTargetWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentTargetWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -94345,27 +94345,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -94380,27 +94380,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -94415,27 +94415,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -94450,27 +94450,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -94485,18 +94485,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -95502,10 +95502,10 @@ @implementation MTRBaseClusterMediaPlayback (Deprecated)
 - (void)playWithParams:(MTRMediaPlaybackClusterPlayParams * _Nullable)params completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self playWithParams:params completion:
-                                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                        // Cast is safe because subclass does not add any selectors.
-                                        completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                    }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)playWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -95514,10 +95514,10 @@ - (void)playWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackRespo
 - (void)pauseWithParams:(MTRMediaPlaybackClusterPauseParams * _Nullable)params completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self pauseWithParams:params completion:
-                                     ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                         // Cast is safe because subclass does not add any selectors.
-                                         completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                     }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)pauseWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -95526,10 +95526,10 @@ - (void)pauseWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResp
 - (void)stopPlaybackWithParams:(MTRMediaPlaybackClusterStopPlaybackParams * _Nullable)params completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self stopWithParams:params completion:
-                                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                        // Cast is safe because subclass does not add any selectors.
-                                        completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                    }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)stopPlaybackWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -95538,10 +95538,10 @@ - (void)stopPlaybackWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlayb
 - (void)startOverWithParams:(MTRMediaPlaybackClusterStartOverParams * _Nullable)params completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self startOverWithParams:params completion:
-                                         ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                             // Cast is safe because subclass does not add any selectors.
-                                             completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                         }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)startOverWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -95550,10 +95550,10 @@ - (void)startOverWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlayback
 - (void)previousWithParams:(MTRMediaPlaybackClusterPreviousParams * _Nullable)params completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self previousWithParams:params completion:
-                                        ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                            // Cast is safe because subclass does not add any selectors.
-                                            completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                        }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)previousWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -95562,10 +95562,10 @@ - (void)previousWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackR
 - (void)nextWithParams:(MTRMediaPlaybackClusterNextParams * _Nullable)params completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self nextWithParams:params completion:
-                                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                        // Cast is safe because subclass does not add any selectors.
-                                        completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                    }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)nextWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -95574,10 +95574,10 @@ - (void)nextWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackRespo
 - (void)rewindWithParams:(MTRMediaPlaybackClusterRewindParams * _Nullable)params completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self rewindWithParams:params completion:
-                                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                          // Cast is safe because subclass does not add any selectors.
-                                          completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                      }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)rewindWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -95586,10 +95586,10 @@ - (void)rewindWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackRes
 - (void)fastForwardWithParams:(MTRMediaPlaybackClusterFastForwardParams * _Nullable)params completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self fastForwardWithParams:params completion:
-                                           ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                               // Cast is safe because subclass does not add any selectors.
-                                               completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                           }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)fastForwardWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -95598,35 +95598,35 @@ - (void)fastForwardWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlayba
 - (void)skipForwardWithParams:(MTRMediaPlaybackClusterSkipForwardParams *)params completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self skipForwardWithParams:params completion:
-                                           ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                               // Cast is safe because subclass does not add any selectors.
-                                               completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                           }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)skipBackwardWithParams:(MTRMediaPlaybackClusterSkipBackwardParams *)params completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self skipBackwardWithParams:params completion:
-                                            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                // Cast is safe because subclass does not add any selectors.
-                                                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                            }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)seekWithParams:(MTRMediaPlaybackClusterSeekParams *)params completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self seekWithParams:params completion:
-                                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                        // Cast is safe because subclass does not add any selectors.
-                                        completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                    }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 
 - (void)readAttributeCurrentStateWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentStateWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentStateWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -95641,27 +95641,27 @@ - (void)subscribeAttributeCurrentStateWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentStateWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentStateWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentStateWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeStartTimeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartTimeWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeStartTimeWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -95676,27 +95676,27 @@ - (void)subscribeAttributeStartTimeWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStartTimeWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeStartTimeWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStartTimeWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeDurationWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDurationWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeDurationWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -95711,27 +95711,27 @@ - (void)subscribeAttributeDurationWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeDurationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeDurationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeDurationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSampledPositionWithCompletionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSampledPositionWithCompletion:
-              ^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackPosition *>(value), error);
-              }];
+            ^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackPosition *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSampledPositionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -95746,27 +95746,27 @@ - (void)subscribeAttributeSampledPositionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSampledPositionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<MTRMediaPlaybackClusterPlaybackPosition *>(value), error);
-                                                                                                                                 }];
+            ^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<MTRMediaPlaybackClusterPlaybackPosition *>(value), error);
+            }];
 }
 + (void)readAttributeSampledPositionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackPosition * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSampledPositionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackPosition *>(value), error);
-                                                                                                                                    }];
+            ^(MTRMediaPlaybackClusterPlaybackPositionStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackPosition *>(value), error);
+            }];
 }
 
 - (void)readAttributePlaybackSpeedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePlaybackSpeedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributePlaybackSpeedWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -95781,27 +95781,27 @@ - (void)subscribeAttributePlaybackSpeedWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributePlaybackSpeedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributePlaybackSpeedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributePlaybackSpeedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSeekRangeEndWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSeekRangeEndWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSeekRangeEndWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -95816,27 +95816,27 @@ - (void)subscribeAttributeSeekRangeEndWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSeekRangeEndWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSeekRangeEndWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSeekRangeEndWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeSeekRangeStartWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSeekRangeStartWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeSeekRangeStartWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                  params:(MTRSubscribeParams * _Nullable)params
@@ -95851,27 +95851,27 @@ - (void)subscribeAttributeSeekRangeStartWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSeekRangeStartWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSeekRangeStartWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSeekRangeStartWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -95886,27 +95886,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -95921,27 +95921,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -95956,27 +95956,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -95991,27 +95991,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -96026,18 +96026,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -96451,12 +96451,12 @@ @implementation MTRBaseClusterMediaInput (Deprecated)
 - (void)selectInputWithParams:(MTRMediaInputClusterSelectInputParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self selectInputWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 - (void)showInputStatusWithParams:(MTRMediaInputClusterShowInputStatusParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self showInputStatusWithParams:params completion:
-                                               completionHandler];
+            completionHandler];
 }
 - (void)showInputStatusWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -96465,7 +96465,7 @@ - (void)showInputStatusWithCompletionHandler:(MTRStatusCompletion)completionHand
 - (void)hideInputStatusWithParams:(MTRMediaInputClusterHideInputStatusParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self hideInputStatusWithParams:params completion:
-                                               completionHandler];
+            completionHandler];
 }
 - (void)hideInputStatusWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -96474,16 +96474,16 @@ - (void)hideInputStatusWithCompletionHandler:(MTRStatusCompletion)completionHand
 - (void)renameInputWithParams:(MTRMediaInputClusterRenameInputParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self renameInputWithParams:params completion:
-                                           completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeInputListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInputListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeInputListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -96498,27 +96498,27 @@ - (void)subscribeAttributeInputListWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInputListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                           }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeInputListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInputListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentInputWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentInputWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentInputWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -96533,27 +96533,27 @@ - (void)subscribeAttributeCurrentInputWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentInputWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentInputWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentInputWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -96568,27 +96568,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -96603,27 +96603,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -96638,27 +96638,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -96673,27 +96673,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -96708,18 +96708,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -96985,7 +96985,7 @@ @implementation MTRBaseClusterLowPower (Deprecated)
 - (void)sleepWithParams:(MTRLowPowerClusterSleepParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self sleepWithParams:params completion:
-                                     completionHandler];
+            completionHandler];
 }
 - (void)sleepWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -96995,10 +96995,10 @@ - (void)sleepWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -97013,27 +97013,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -97048,27 +97048,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -97083,27 +97083,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -97118,27 +97118,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -97153,18 +97153,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -97426,19 +97426,19 @@ @implementation MTRBaseClusterKeypadInput (Deprecated)
 - (void)sendKeyWithParams:(MTRKeypadInputClusterSendKeyParams *)params completionHandler:(void (^)(MTRKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self sendKeyWithParams:params completion:
-                                       ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error) {
-                                           // Cast is safe because subclass does not add any selectors.
-                                           completionHandler(static_cast<MTRKeypadInputClusterSendKeyResponseParams *>(data), error);
-                                       }];
+            ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRKeypadInputClusterSendKeyResponseParams *>(data), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -97453,27 +97453,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -97488,27 +97488,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -97523,27 +97523,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -97558,27 +97558,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -97593,18 +97593,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -97990,27 +97990,27 @@ @implementation MTRBaseClusterContentLauncher (Deprecated)
 - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params completionHandler:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self launchContentWithParams:params completion:
-                                             ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                 // Cast is safe because subclass does not add any selectors.
-                                                 completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
-                                             }];
+            ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
+            }];
 }
 - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params completionHandler:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self launchURLWithParams:params completion:
-                                         ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
-                                             // Cast is safe because subclass does not add any selectors.
-                                             completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
-                                         }];
+            ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
+            }];
 }
 
 - (void)readAttributeAcceptHeaderWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptHeaderWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptHeaderWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                params:(MTRSubscribeParams * _Nullable)params
@@ -98025,27 +98025,27 @@ - (void)subscribeAttributeAcceptHeaderWithMinInterval:(NSNumber * _Nonnull)minIn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptHeaderWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptHeaderWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptHeaderWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                 ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                 }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeSupportedStreamingProtocolsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedStreamingProtocolsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeSupportedStreamingProtocolsWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -98068,27 +98068,27 @@ - (void)subscribeAttributeSupportedStreamingProtocolsWithMinInterval:(NSNumber *
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeSupportedStreamingProtocolsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeSupportedStreamingProtocolsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeSupportedStreamingProtocolsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -98103,27 +98103,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -98138,27 +98138,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -98173,27 +98173,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -98208,27 +98208,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -98243,18 +98243,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -98612,21 +98612,21 @@ @implementation MTRBaseClusterAudioOutput (Deprecated)
 - (void)selectOutputWithParams:(MTRAudioOutputClusterSelectOutputParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self selectOutputWithParams:params completion:
-                                            completionHandler];
+            completionHandler];
 }
 - (void)renameOutputWithParams:(MTRAudioOutputClusterRenameOutputParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self renameOutputWithParams:params completion:
-                                            completionHandler];
+            completionHandler];
 }
 
 - (void)readAttributeOutputListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOutputListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeOutputListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -98641,27 +98641,27 @@ - (void)subscribeAttributeOutputListWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOutputListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                            }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeOutputListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOutputListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentOutputWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentOutputWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCurrentOutputWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -98676,27 +98676,27 @@ - (void)subscribeAttributeCurrentOutputWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentOutputWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentOutputWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentOutputWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -98711,27 +98711,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -98746,27 +98746,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -98781,27 +98781,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -98816,27 +98816,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -98851,18 +98851,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -99294,35 +99294,35 @@ @implementation MTRBaseClusterApplicationLauncher (Deprecated)
 - (void)launchAppWithParams:(MTRApplicationLauncherClusterLaunchAppParams * _Nullable)params completionHandler:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self launchAppWithParams:params completion:
-                                         ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
-                                             // Cast is safe because subclass does not add any selectors.
-                                             completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
-                                         }];
+            ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
+            }];
 }
 - (void)stopAppWithParams:(MTRApplicationLauncherClusterStopAppParams * _Nullable)params completionHandler:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self stopAppWithParams:params completion:
-                                       ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
-                                           // Cast is safe because subclass does not add any selectors.
-                                           completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
-                                       }];
+            ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
+            }];
 }
 - (void)hideAppWithParams:(MTRApplicationLauncherClusterHideAppParams * _Nullable)params completionHandler:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self hideAppWithParams:params completion:
-                                       ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
-                                           // Cast is safe because subclass does not add any selectors.
-                                           completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
-                                       }];
+            ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
+            }];
 }
 
 - (void)readAttributeCatalogListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCatalogListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeCatalogListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -99337,27 +99337,27 @@ - (void)subscribeAttributeCatalogListWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCatalogListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                             }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeCatalogListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCatalogListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeCurrentAppWithCompletionHandler:(void (^)(MTRApplicationLauncherClusterApplicationEP * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentAppWithCompletion:
-              ^(MTRApplicationLauncherClusterApplicationEPStruct * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<MTRApplicationLauncherClusterApplicationEP *>(value), error);
-              }];
+            ^(MTRApplicationLauncherClusterApplicationEPStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRApplicationLauncherClusterApplicationEP *>(value), error);
+            }];
 }
 - (void)writeAttributeCurrentAppWithValue:(MTRApplicationLauncherClusterApplicationEP * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -99380,27 +99380,27 @@ - (void)subscribeAttributeCurrentAppWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCurrentAppWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(MTRApplicationLauncherClusterApplicationEPStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<MTRApplicationLauncherClusterApplicationEP *>(value), error);
-                                                                                                                            }];
+            ^(MTRApplicationLauncherClusterApplicationEPStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<MTRApplicationLauncherClusterApplicationEP *>(value), error);
+            }];
 }
 + (void)readAttributeCurrentAppWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(MTRApplicationLauncherClusterApplicationEP * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCurrentAppWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(MTRApplicationLauncherClusterApplicationEPStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<MTRApplicationLauncherClusterApplicationEP *>(value), error);
-                                                                                                                               }];
+            ^(MTRApplicationLauncherClusterApplicationEPStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRApplicationLauncherClusterApplicationEP *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -99415,27 +99415,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -99450,27 +99450,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -99485,27 +99485,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -99520,27 +99520,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -99555,18 +99555,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -100091,10 +100091,10 @@ @implementation MTRBaseClusterApplicationBasic (Deprecated)
 - (void)readAttributeVendorNameWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorNameWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -100109,27 +100109,27 @@ - (void)subscribeAttributeVendorNameWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeVendorNameWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                            }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeVendorNameWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorNameWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                               }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeVendorIDWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorIDWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                            params:(MTRSubscribeParams * _Nullable)params
@@ -100144,27 +100144,27 @@ - (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeVendorIDWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeVendorIDWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorIDWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeApplicationNameWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeApplicationNameWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeApplicationNameWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -100179,27 +100179,27 @@ - (void)subscribeAttributeApplicationNameWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeApplicationNameWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                 }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeApplicationNameWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeApplicationNameWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                    }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeProductIDWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductIDWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                             params:(MTRSubscribeParams * _Nullable)params
@@ -100214,27 +100214,27 @@ - (void)subscribeAttributeProductIDWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeProductIDWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeProductIDWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeProductIDWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeApplicationWithCompletionHandler:(void (^)(MTRApplicationBasicClusterApplicationBasicApplication * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeApplicationWithCompletion:
-              ^(MTRApplicationBasicClusterApplicationStruct * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<MTRApplicationBasicClusterApplicationBasicApplication *>(value), error);
-              }];
+            ^(MTRApplicationBasicClusterApplicationStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRApplicationBasicClusterApplicationBasicApplication *>(value), error);
+            }];
 }
 - (void)subscribeAttributeApplicationWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                               params:(MTRSubscribeParams * _Nullable)params
@@ -100249,27 +100249,27 @@ - (void)subscribeAttributeApplicationWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeApplicationWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(MTRApplicationBasicClusterApplicationStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<MTRApplicationBasicClusterApplicationBasicApplication *>(value), error);
-                                                                                                                             }];
+            ^(MTRApplicationBasicClusterApplicationStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<MTRApplicationBasicClusterApplicationBasicApplication *>(value), error);
+            }];
 }
 + (void)readAttributeApplicationWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(MTRApplicationBasicClusterApplicationBasicApplication * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeApplicationWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(MTRApplicationBasicClusterApplicationStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<MTRApplicationBasicClusterApplicationBasicApplication *>(value), error);
-                                                                                                                                }];
+            ^(MTRApplicationBasicClusterApplicationStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRApplicationBasicClusterApplicationBasicApplication *>(value), error);
+            }];
 }
 
 - (void)readAttributeStatusWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStatusWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                          params:(MTRSubscribeParams * _Nullable)params
@@ -100284,27 +100284,27 @@ - (void)subscribeAttributeStatusWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStatusWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeStatusWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStatusWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeApplicationVersionWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeApplicationVersionWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)subscribeAttributeApplicationVersionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                      params:(MTRSubscribeParams * _Nullable)params
@@ -100319,27 +100319,27 @@ - (void)subscribeAttributeApplicationVersionWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeApplicationVersionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                    }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeApplicationVersionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeApplicationVersionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                       }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeAllowedVendorListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAllowedVendorListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAllowedVendorListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                     params:(MTRSubscribeParams * _Nullable)params
@@ -100354,27 +100354,27 @@ - (void)subscribeAttributeAllowedVendorListWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAllowedVendorListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                   }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAllowedVendorListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAllowedVendorListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -100389,27 +100389,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -100424,27 +100424,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -100459,27 +100459,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -100494,27 +100494,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -100529,18 +100529,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -100863,20 +100863,20 @@ @implementation MTRBaseClusterAccountLogin (Deprecated)
 - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params completionHandler:(void (^)(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getSetupPINWithParams:params completion:
-                                           ^(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable data, NSError * _Nullable error) {
-                                               // Cast is safe because subclass does not add any selectors.
-                                               completionHandler(static_cast<MTRAccountLoginClusterGetSetupPINResponseParams *>(data), error);
-                                           }];
+            ^(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRAccountLoginClusterGetSetupPINResponseParams *>(data), error);
+            }];
 }
 - (void)loginWithParams:(MTRAccountLoginClusterLoginParams *)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self loginWithParams:params completion:
-                                     completionHandler];
+            completionHandler];
 }
 - (void)logoutWithParams:(MTRAccountLoginClusterLogoutParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self logoutWithParams:params completion:
-                                      completionHandler];
+            completionHandler];
 }
 - (void)logoutWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -100886,10 +100886,10 @@ - (void)logoutWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -100904,27 +100904,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -100939,27 +100939,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -100974,27 +100974,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -101009,27 +101009,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -101044,18 +101044,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
@@ -109869,7 +109869,7 @@ @implementation MTRBaseClusterTestCluster (Deprecated)
 - (void)testWithParams:(MTRTestClusterClusterTestParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self testWithParams:params completion:
-                                    completionHandler];
+            completionHandler];
 }
 - (void)testWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -109878,7 +109878,7 @@ - (void)testWithCompletionHandler:(MTRStatusCompletion)completionHandler
 - (void)testNotHandledWithParams:(MTRTestClusterClusterTestNotHandledParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self testNotHandledWithParams:params completion:
-                                              completionHandler];
+            completionHandler];
 }
 - (void)testNotHandledWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -109887,10 +109887,10 @@ - (void)testNotHandledWithCompletionHandler:(MTRStatusCompletion)completionHandl
 - (void)testSpecificWithParams:(MTRTestClusterClusterTestSpecificParams * _Nullable)params completionHandler:(void (^)(MTRTestClusterClusterTestSpecificResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testSpecificWithParams:params completion:
-                                            ^(MTRUnitTestingClusterTestSpecificResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                // Cast is safe because subclass does not add any selectors.
-                                                completionHandler(static_cast<MTRTestClusterClusterTestSpecificResponseParams *>(data), error);
-                                            }];
+            ^(MTRUnitTestingClusterTestSpecificResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestSpecificResponseParams *>(data), error);
+            }];
 }
 - (void)testSpecificWithCompletionHandler:(void (^)(MTRTestClusterClusterTestSpecificResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -109899,7 +109899,7 @@ - (void)testSpecificWithCompletionHandler:(void (^)(MTRTestClusterClusterTestSpe
 - (void)testUnknownCommandWithParams:(MTRTestClusterClusterTestUnknownCommandParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self testUnknownCommandWithParams:params completion:
-                                                  completionHandler];
+            completionHandler];
 }
 - (void)testUnknownCommandWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -109908,98 +109908,98 @@ - (void)testUnknownCommandWithCompletionHandler:(MTRStatusCompletion)completionH
 - (void)testAddArgumentsWithParams:(MTRTestClusterClusterTestAddArgumentsParams *)params completionHandler:(void (^)(MTRTestClusterClusterTestAddArgumentsResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testAddArgumentsWithParams:params completion:
-                                                ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                    // Cast is safe because subclass does not add any selectors.
-                                                    completionHandler(static_cast<MTRTestClusterClusterTestAddArgumentsResponseParams *>(data), error);
-                                                }];
+            ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestAddArgumentsResponseParams *>(data), error);
+            }];
 }
 - (void)testSimpleArgumentRequestWithParams:(MTRTestClusterClusterTestSimpleArgumentRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterTestSimpleArgumentResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testSimpleArgumentRequestWithParams:params completion:
-                                                         ^(MTRUnitTestingClusterTestSimpleArgumentResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                             // Cast is safe because subclass does not add any selectors.
-                                                             completionHandler(static_cast<MTRTestClusterClusterTestSimpleArgumentResponseParams *>(data), error);
-                                                         }];
+            ^(MTRUnitTestingClusterTestSimpleArgumentResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestSimpleArgumentResponseParams *>(data), error);
+            }];
 }
 - (void)testStructArrayArgumentRequestWithParams:(MTRTestClusterClusterTestStructArrayArgumentRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterTestStructArrayArgumentResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testStructArrayArgumentRequestWithParams:params completion:
-                                                              ^(MTRUnitTestingClusterTestStructArrayArgumentResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                  completionHandler(static_cast<MTRTestClusterClusterTestStructArrayArgumentResponseParams *>(data), error);
-                                                              }];
+            ^(MTRUnitTestingClusterTestStructArrayArgumentResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestStructArrayArgumentResponseParams *>(data), error);
+            }];
 }
 - (void)testStructArgumentRequestWithParams:(MTRTestClusterClusterTestStructArgumentRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testStructArgumentRequestWithParams:params completion:
-                                                         ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                             // Cast is safe because subclass does not add any selectors.
-                                                             completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                         }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testNestedStructArgumentRequestWithParams:(MTRTestClusterClusterTestNestedStructArgumentRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testNestedStructArgumentRequestWithParams:params completion:
-                                                               ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                   completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                               }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testListStructArgumentRequestWithParams:(MTRTestClusterClusterTestListStructArgumentRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testListStructArgumentRequestWithParams:params completion:
-                                                             ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                 completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                             }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testListInt8UArgumentRequestWithParams:(MTRTestClusterClusterTestListInt8UArgumentRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testListInt8UArgumentRequestWithParams:params completion:
-                                                            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                // Cast is safe because subclass does not add any selectors.
-                                                                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                            }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testNestedStructListArgumentRequestWithParams:(MTRTestClusterClusterTestNestedStructListArgumentRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testNestedStructListArgumentRequestWithParams:params completion:
-                                                                   ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                       completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                                   }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testListNestedStructListArgumentRequestWithParams:(MTRTestClusterClusterTestListNestedStructListArgumentRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testListNestedStructListArgumentRequestWithParams:params completion:
-                                                                       ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                           completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                                       }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testListInt8UReverseRequestWithParams:(MTRTestClusterClusterTestListInt8UReverseRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterTestListInt8UReverseResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testListInt8UReverseRequestWithParams:params completion:
-                                                           ^(MTRUnitTestingClusterTestListInt8UReverseResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                               // Cast is safe because subclass does not add any selectors.
-                                                               completionHandler(static_cast<MTRTestClusterClusterTestListInt8UReverseResponseParams *>(data), error);
-                                                           }];
+            ^(MTRUnitTestingClusterTestListInt8UReverseResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestListInt8UReverseResponseParams *>(data), error);
+            }];
 }
 - (void)testEnumsRequestWithParams:(MTRTestClusterClusterTestEnumsRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterTestEnumsResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testEnumsRequestWithParams:params completion:
-                                                ^(MTRUnitTestingClusterTestEnumsResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                    // Cast is safe because subclass does not add any selectors.
-                                                    completionHandler(static_cast<MTRTestClusterClusterTestEnumsResponseParams *>(data), error);
-                                                }];
+            ^(MTRUnitTestingClusterTestEnumsResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestEnumsResponseParams *>(data), error);
+            }];
 }
 - (void)testNullableOptionalRequestWithParams:(MTRTestClusterClusterTestNullableOptionalRequestParams * _Nullable)params completionHandler:(void (^)(MTRTestClusterClusterTestNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testNullableOptionalRequestWithParams:params completion:
-                                                           ^(MTRUnitTestingClusterTestNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                               // Cast is safe because subclass does not add any selectors.
-                                                               completionHandler(static_cast<MTRTestClusterClusterTestNullableOptionalResponseParams *>(data), error);
-                                                           }];
+            ^(MTRUnitTestingClusterTestNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestNullableOptionalResponseParams *>(data), error);
+            }];
 }
 - (void)testNullableOptionalRequestWithCompletionHandler:(void (^)(MTRTestClusterClusterTestNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -110008,23 +110008,23 @@ - (void)testNullableOptionalRequestWithCompletionHandler:(void (^)(MTRTestCluste
 - (void)testComplexNullableOptionalRequestWithParams:(MTRTestClusterClusterTestComplexNullableOptionalRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterTestComplexNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testComplexNullableOptionalRequestWithParams:params completion:
-                                                                  ^(MTRUnitTestingClusterTestComplexNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                      completionHandler(static_cast<MTRTestClusterClusterTestComplexNullableOptionalResponseParams *>(data), error);
-                                                                  }];
+            ^(MTRUnitTestingClusterTestComplexNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestComplexNullableOptionalResponseParams *>(data), error);
+            }];
 }
 - (void)simpleStructEchoRequestWithParams:(MTRTestClusterClusterSimpleStructEchoRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterSimpleStructResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self simpleStructEchoRequestWithParams:params completion:
-                                                       ^(MTRUnitTestingClusterSimpleStructResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                           // Cast is safe because subclass does not add any selectors.
-                                                           completionHandler(static_cast<MTRTestClusterClusterSimpleStructResponseParams *>(data), error);
-                                                       }];
+            ^(MTRUnitTestingClusterSimpleStructResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterSimpleStructResponseParams *>(data), error);
+            }];
 }
 - (void)timedInvokeRequestWithParams:(MTRTestClusterClusterTimedInvokeRequestParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self timedInvokeRequestWithParams:params completion:
-                                                  completionHandler];
+            completionHandler];
 }
 - (void)timedInvokeRequestWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110033,7 +110033,7 @@ - (void)timedInvokeRequestWithCompletionHandler:(MTRStatusCompletion)completionH
 - (void)testSimpleOptionalArgumentRequestWithParams:(MTRTestClusterClusterTestSimpleOptionalArgumentRequestParams * _Nullable)params completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self testSimpleOptionalArgumentRequestWithParams:params completion:
-                                                                 completionHandler];
+            completionHandler];
 }
 - (void)testSimpleOptionalArgumentRequestWithCompletionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110042,27 +110042,27 @@ - (void)testSimpleOptionalArgumentRequestWithCompletionHandler:(MTRStatusComplet
 - (void)testEmitTestEventRequestWithParams:(MTRTestClusterClusterTestEmitTestEventRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterTestEmitTestEventResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testEmitTestEventRequestWithParams:params completion:
-                                                        ^(MTRUnitTestingClusterTestEmitTestEventResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                            // Cast is safe because subclass does not add any selectors.
-                                                            completionHandler(static_cast<MTRTestClusterClusterTestEmitTestEventResponseParams *>(data), error);
-                                                        }];
+            ^(MTRUnitTestingClusterTestEmitTestEventResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestEmitTestEventResponseParams *>(data), error);
+            }];
 }
 - (void)testEmitTestFabricScopedEventRequestWithParams:(MTRTestClusterClusterTestEmitTestFabricScopedEventRequestParams *)params completionHandler:(void (^)(MTRTestClusterClusterTestEmitTestFabricScopedEventResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testEmitTestFabricScopedEventRequestWithParams:params completion:
-                                                                    ^(MTRUnitTestingClusterTestEmitTestFabricScopedEventResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                        completionHandler(static_cast<MTRTestClusterClusterTestEmitTestFabricScopedEventResponseParams *>(data), error);
-                                                                    }];
+            ^(MTRUnitTestingClusterTestEmitTestFabricScopedEventResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestEmitTestFabricScopedEventResponseParams *>(data), error);
+            }];
 }
 
 - (void)readAttributeBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBooleanWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110085,27 +110085,27 @@ - (void)subscribeAttributeBooleanWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBooleanWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBooleanWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBooleanWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBitmap8WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBitmap8WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeBitmap8WithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110128,27 +110128,27 @@ - (void)subscribeAttributeBitmap8WithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBitmap8WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBitmap8WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBitmap8WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBitmap16WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBitmap16WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeBitmap16WithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110171,27 +110171,27 @@ - (void)subscribeAttributeBitmap16WithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBitmap16WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBitmap16WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBitmap16WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBitmap32WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBitmap32WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeBitmap32WithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110214,27 +110214,27 @@ - (void)subscribeAttributeBitmap32WithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBitmap32WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBitmap32WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBitmap32WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeBitmap64WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBitmap64WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeBitmap64WithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110257,27 +110257,27 @@ - (void)subscribeAttributeBitmap64WithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeBitmap64WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeBitmap64WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeBitmap64WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt8uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt8uWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110300,27 +110300,27 @@ - (void)subscribeAttributeInt8uWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt8uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt8uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt8uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt16uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt16uWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110343,27 +110343,27 @@ - (void)subscribeAttributeInt16uWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt16uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt16uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt16uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt24uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt24uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt24uWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110386,27 +110386,27 @@ - (void)subscribeAttributeInt24uWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt24uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt24uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt24uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt32uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt32uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt32uWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110429,27 +110429,27 @@ - (void)subscribeAttributeInt32uWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt32uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt32uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt32uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt40uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt40uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt40uWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110472,27 +110472,27 @@ - (void)subscribeAttributeInt40uWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt40uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt40uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt40uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt48uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt48uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt48uWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110515,27 +110515,27 @@ - (void)subscribeAttributeInt48uWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt48uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt48uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt48uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt56uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt56uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt56uWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110558,27 +110558,27 @@ - (void)subscribeAttributeInt56uWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt56uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt56uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt56uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt64uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt64uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt64uWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110601,27 +110601,27 @@ - (void)subscribeAttributeInt64uWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt64uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt64uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt64uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt8sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt8sWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110644,27 +110644,27 @@ - (void)subscribeAttributeInt8sWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt8sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt8sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt8sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt16sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt16sWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110687,27 +110687,27 @@ - (void)subscribeAttributeInt16sWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt16sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt16sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt16sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt24sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt24sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt24sWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110730,27 +110730,27 @@ - (void)subscribeAttributeInt24sWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt24sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt24sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt24sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt32sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt32sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt32sWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110773,27 +110773,27 @@ - (void)subscribeAttributeInt32sWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt32sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt32sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt32sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt40sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt40sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt40sWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110816,27 +110816,27 @@ - (void)subscribeAttributeInt40sWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt40sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt40sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt40sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt48sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt48sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt48sWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110859,27 +110859,27 @@ - (void)subscribeAttributeInt48sWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt48sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt48sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt48sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt56sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt56sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt56sWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110902,27 +110902,27 @@ - (void)subscribeAttributeInt56sWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt56sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt56sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt56sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeInt64sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt64sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeInt64sWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110945,27 +110945,27 @@ - (void)subscribeAttributeInt64sWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeInt64sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeInt64sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeInt64sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEnum8WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnum8WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeEnum8WithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -110988,27 +110988,27 @@ - (void)subscribeAttributeEnum8WithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEnum8WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEnum8WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnum8WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEnum16WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnum16WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeEnum16WithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111031,27 +111031,27 @@ - (void)subscribeAttributeEnum16WithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEnum16WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEnum16WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnum16WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeFloatSingleWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFloatSingleWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeFloatSingleWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111074,27 +111074,27 @@ - (void)subscribeAttributeFloatSingleWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFloatSingleWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFloatSingleWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFloatSingleWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeFloatDoubleWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFloatDoubleWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeFloatDoubleWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111117,27 +111117,27 @@ - (void)subscribeAttributeFloatDoubleWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFloatDoubleWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFloatDoubleWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFloatDoubleWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeOctetStringWithCompletionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOctetStringWithCompletion:
-              ^(NSData * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSData *>(value), error);
-              }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 - (void)writeAttributeOctetStringWithValue:(NSData * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111160,27 +111160,27 @@ - (void)subscribeAttributeOctetStringWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeOctetStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSData *>(value), error);
-                                                                                                                             }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSData *>(value), error);
+            }];
 }
 + (void)readAttributeOctetStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeOctetStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSData *>(value), error);
-                                                                                                                                }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 
 - (void)readAttributeListInt8uWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListInt8uWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeListInt8uWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111203,27 +111203,27 @@ - (void)subscribeAttributeListInt8uWithMinInterval:(NSNumber * _Nonnull)minInter
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeListInt8uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                           ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                           }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeListInt8uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListInt8uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                  completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeListOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListOctetStringWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeListOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111246,27 +111246,27 @@ - (void)subscribeAttributeListOctetStringWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeListOctetStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                 }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeListOctetStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListOctetStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                    }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeListStructOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListStructOctetStringWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeListStructOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111289,27 +111289,27 @@ - (void)subscribeAttributeListStructOctetStringWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeListStructOctetStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                       }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeListStructOctetStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListStructOctetStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                          }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeLongOctetStringWithCompletionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLongOctetStringWithCompletion:
-              ^(NSData * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSData *>(value), error);
-              }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 - (void)writeAttributeLongOctetStringWithValue:(NSData * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111332,27 +111332,27 @@ - (void)subscribeAttributeLongOctetStringWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLongOctetStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSData *>(value), error);
-                                                                                                                                 }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSData *>(value), error);
+            }];
 }
 + (void)readAttributeLongOctetStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLongOctetStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSData *>(value), error);
-                                                                                                                                    }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 
 - (void)readAttributeCharStringWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCharStringWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)writeAttributeCharStringWithValue:(NSString * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111375,27 +111375,27 @@ - (void)subscribeAttributeCharStringWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeCharStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                            }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeCharStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeCharStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                               }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeLongCharStringWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLongCharStringWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)writeAttributeLongCharStringWithValue:(NSString * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111418,27 +111418,27 @@ - (void)subscribeAttributeLongCharStringWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeLongCharStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeLongCharStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeLongCharStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                   }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeEpochUsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEpochUsWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeEpochUsWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111461,27 +111461,27 @@ - (void)subscribeAttributeEpochUsWithMinInterval:(NSNumber * _Nonnull)minInterva
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEpochUsWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                             reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEpochUsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEpochUsWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeEpochSWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEpochSWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeEpochSWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111504,27 +111504,27 @@ - (void)subscribeAttributeEpochSWithMinInterval:(NSNumber * _Nonnull)minInterval
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEpochSWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                            reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEpochSWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEpochSWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                           ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                               completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                           }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeVendorIdWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorIdWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeVendorIdWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111547,27 +111547,27 @@ - (void)subscribeAttributeVendorIdWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeVendorIdWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeVendorIdWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeVendorIdWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeListNullablesAndOptionalsStructWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListNullablesAndOptionalsStructWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeListNullablesAndOptionalsStructWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111590,27 +111590,27 @@ - (void)subscribeAttributeListNullablesAndOptionalsStructWithMinInterval:(NSNumb
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeListNullablesAndOptionalsStructWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                                 ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                                 }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeListNullablesAndOptionalsStructWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListNullablesAndOptionalsStructWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                    ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                        completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                                    }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeEnumAttrWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnumAttrWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeEnumAttrWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111633,27 +111633,27 @@ - (void)subscribeAttributeEnumAttrWithMinInterval:(NSNumber * _Nonnull)minInterv
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeEnumAttrWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                              reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeEnumAttrWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeEnumAttrWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeStructAttrWithCompletionHandler:(void (^)(MTRTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStructAttrWithCompletion:
-              ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
-              }];
+            ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
+            }];
 }
 - (void)writeAttributeStructAttrWithValue:(MTRTestClusterClusterSimpleStruct * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111676,27 +111676,27 @@ - (void)subscribeAttributeStructAttrWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeStructAttrWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
-                                                                                                                            }];
+            ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
+            }];
 }
 + (void)readAttributeStructAttrWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(MTRTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeStructAttrWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
-                                                                                                                               }];
+            ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
+            }];
 }
 
 - (void)readAttributeRangeRestrictedInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRangeRestrictedInt8uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeRangeRestrictedInt8uWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111719,27 +111719,27 @@ - (void)subscribeAttributeRangeRestrictedInt8uWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRangeRestrictedInt8uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRangeRestrictedInt8uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRangeRestrictedInt8uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRangeRestrictedInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRangeRestrictedInt8sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeRangeRestrictedInt8sWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111762,27 +111762,27 @@ - (void)subscribeAttributeRangeRestrictedInt8sWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRangeRestrictedInt8sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRangeRestrictedInt8sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRangeRestrictedInt8sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                         }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRangeRestrictedInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRangeRestrictedInt16uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeRangeRestrictedInt16uWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111805,27 +111805,27 @@ - (void)subscribeAttributeRangeRestrictedInt16uWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRangeRestrictedInt16uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRangeRestrictedInt16uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRangeRestrictedInt16uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeRangeRestrictedInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRangeRestrictedInt16sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeRangeRestrictedInt16sWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111848,27 +111848,27 @@ - (void)subscribeAttributeRangeRestrictedInt16sWithMinInterval:(NSNumber * _Nonn
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeRangeRestrictedInt16sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                       ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                       }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeRangeRestrictedInt16sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeRangeRestrictedInt16sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                          ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                              completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                          }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeListLongOctetStringWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListLongOctetStringWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeListLongOctetStringWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111891,27 +111891,27 @@ - (void)subscribeAttributeListLongOctetStringWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeListLongOctetStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeListLongOctetStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListLongOctetStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeListFabricScopedWithParams:(MTRReadParams * _Nullable)params completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListFabricScopedWithParams:params completion:
-                                                             ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                 completionHandler(static_cast<NSArray *>(value), error);
-                                                             }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)writeAttributeListFabricScopedWithValue:(NSArray * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111934,27 +111934,27 @@ - (void)subscribeAttributeListFabricScopedWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeListFabricScopedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeListFabricScopedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeListFabricScopedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeTimedWriteBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTimedWriteBooleanWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeTimedWriteBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -111977,27 +111977,27 @@ - (void)subscribeAttributeTimedWriteBooleanWithMinInterval:(NSNumber * _Nonnull)
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeTimedWriteBooleanWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeTimedWriteBooleanWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeTimedWriteBooleanWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                      ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                      }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneralErrorBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneralErrorBooleanWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeGeneralErrorBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112020,27 +112020,27 @@ - (void)subscribeAttributeGeneralErrorBooleanWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneralErrorBooleanWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeGeneralErrorBooleanWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneralErrorBooleanWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterErrorBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterErrorBooleanWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeClusterErrorBooleanWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112063,27 +112063,27 @@ - (void)subscribeAttributeClusterErrorBooleanWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterErrorBooleanWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterErrorBooleanWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterErrorBooleanWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeUnsupportedWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnsupportedWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeUnsupportedWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112106,27 +112106,27 @@ - (void)subscribeAttributeUnsupportedWithMinInterval:(NSNumber * _Nonnull)minInt
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeUnsupportedWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                             ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                 reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                             }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeUnsupportedWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeUnsupportedWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableBooleanWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableBooleanWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableBooleanWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112149,27 +112149,27 @@ - (void)subscribeAttributeNullableBooleanWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableBooleanWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableBooleanWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableBooleanWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableBitmap8WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableBitmap8WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableBitmap8WithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112192,27 +112192,27 @@ - (void)subscribeAttributeNullableBitmap8WithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableBitmap8WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableBitmap8WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableBitmap8WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableBitmap16WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableBitmap16WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableBitmap16WithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112235,27 +112235,27 @@ - (void)subscribeAttributeNullableBitmap16WithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableBitmap16WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableBitmap16WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableBitmap16WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableBitmap32WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableBitmap32WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableBitmap32WithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112278,27 +112278,27 @@ - (void)subscribeAttributeNullableBitmap32WithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableBitmap32WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableBitmap32WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableBitmap32WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableBitmap64WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableBitmap64WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableBitmap64WithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112321,27 +112321,27 @@ - (void)subscribeAttributeNullableBitmap64WithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableBitmap64WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableBitmap64WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableBitmap64WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt8uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt8uWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112364,27 +112364,27 @@ - (void)subscribeAttributeNullableInt8uWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt8uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt8uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt8uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt16uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt16uWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112407,27 +112407,27 @@ - (void)subscribeAttributeNullableInt16uWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt16uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt16uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt16uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt24uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt24uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt24uWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112450,27 +112450,27 @@ - (void)subscribeAttributeNullableInt24uWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt24uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt24uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt24uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt32uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt32uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt32uWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112493,27 +112493,27 @@ - (void)subscribeAttributeNullableInt32uWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt32uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt32uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt32uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt40uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt40uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt40uWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112536,27 +112536,27 @@ - (void)subscribeAttributeNullableInt40uWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt40uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt40uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt40uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt48uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt48uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt48uWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112579,27 +112579,27 @@ - (void)subscribeAttributeNullableInt48uWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt48uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt48uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt48uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt56uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt56uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt56uWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112622,27 +112622,27 @@ - (void)subscribeAttributeNullableInt56uWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt56uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt56uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt56uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt64uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt64uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt64uWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112665,27 +112665,27 @@ - (void)subscribeAttributeNullableInt64uWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt64uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt64uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt64uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt8sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt8sWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112708,27 +112708,27 @@ - (void)subscribeAttributeNullableInt8sWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt8sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt8sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt8sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt16sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt16sWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112751,27 +112751,27 @@ - (void)subscribeAttributeNullableInt16sWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt16sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt16sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt16sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt24sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt24sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt24sWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112794,27 +112794,27 @@ - (void)subscribeAttributeNullableInt24sWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt24sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt24sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt24sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt32sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt32sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt32sWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112837,27 +112837,27 @@ - (void)subscribeAttributeNullableInt32sWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt32sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt32sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt32sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt40sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt40sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt40sWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112880,27 +112880,27 @@ - (void)subscribeAttributeNullableInt40sWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt40sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt40sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt40sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt48sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt48sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt48sWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112923,27 +112923,27 @@ - (void)subscribeAttributeNullableInt48sWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt48sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt48sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt48sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt56sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt56sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt56sWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -112966,27 +112966,27 @@ - (void)subscribeAttributeNullableInt56sWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt56sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt56sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt56sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableInt64sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt64sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableInt64sWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113009,27 +113009,27 @@ - (void)subscribeAttributeNullableInt64sWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableInt64sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableInt64sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableInt64sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableEnum8WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableEnum8WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableEnum8WithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113052,27 +113052,27 @@ - (void)subscribeAttributeNullableEnum8WithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableEnum8WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableEnum8WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableEnum8WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableEnum16WithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableEnum16WithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableEnum16WithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113095,27 +113095,27 @@ - (void)subscribeAttributeNullableEnum16WithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableEnum16WithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableEnum16WithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableEnum16WithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableFloatSingleWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableFloatSingleWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableFloatSingleWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113138,27 +113138,27 @@ - (void)subscribeAttributeNullableFloatSingleWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableFloatSingleWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableFloatSingleWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableFloatSingleWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableFloatDoubleWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableFloatDoubleWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableFloatDoubleWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113181,27 +113181,27 @@ - (void)subscribeAttributeNullableFloatDoubleWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableFloatDoubleWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableFloatDoubleWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableFloatDoubleWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                        }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableOctetStringWithCompletionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableOctetStringWithCompletion:
-              ^(NSData * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSData *>(value), error);
-              }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableOctetStringWithValue:(NSData * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113224,27 +113224,27 @@ - (void)subscribeAttributeNullableOctetStringWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableOctetStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSData *>(value), error);
-                                                                                                                                     }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSData *>(value), error);
+            }];
 }
 + (void)readAttributeNullableOctetStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSData * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableOctetStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSData * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSData *>(value), error);
-                                                                                                                                        }];
+            ^(NSData * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSData *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableCharStringWithCompletionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableCharStringWithCompletion:
-              ^(NSString * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSString *>(value), error);
-              }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableCharStringWithValue:(NSString * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113267,27 +113267,27 @@ - (void)subscribeAttributeNullableCharStringWithMinInterval:(NSNumber * _Nonnull
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableCharStringWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                    ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        reportHandler(static_cast<NSString *>(value), error);
-                                                                                                                                    }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSString *>(value), error);
+            }];
 }
 + (void)readAttributeNullableCharStringWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableCharStringWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                       ^(NSString * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<NSString *>(value), error);
-                                                                                                                                       }];
+            ^(NSString * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSString *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableEnumAttrWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableEnumAttrWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableEnumAttrWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113310,27 +113310,27 @@ - (void)subscribeAttributeNullableEnumAttrWithMinInterval:(NSNumber * _Nonnull)m
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableEnumAttrWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableEnumAttrWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableEnumAttrWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                     ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                     }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableStructWithCompletionHandler:(void (^)(MTRTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableStructWithCompletion:
-              ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
-              }];
+            ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableStructWithValue:(MTRTestClusterClusterSimpleStruct * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113353,27 +113353,27 @@ - (void)subscribeAttributeNullableStructWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableStructWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
-                                                                                                                                }];
+            ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
+            }];
 }
 + (void)readAttributeNullableStructWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(MTRTestClusterClusterSimpleStruct * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableStructWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
-                                                                                                                                   }];
+            ^(MTRUnitTestingClusterSimpleStruct * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterSimpleStruct *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableRangeRestrictedInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableRangeRestrictedInt8uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableRangeRestrictedInt8uWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113396,27 +113396,27 @@ - (void)subscribeAttributeNullableRangeRestrictedInt8uWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableRangeRestrictedInt8uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableRangeRestrictedInt8uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableRangeRestrictedInt8uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableRangeRestrictedInt8sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableRangeRestrictedInt8sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableRangeRestrictedInt8sWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113439,27 +113439,27 @@ - (void)subscribeAttributeNullableRangeRestrictedInt8sWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableRangeRestrictedInt8sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableRangeRestrictedInt8sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableRangeRestrictedInt8sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableRangeRestrictedInt16uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableRangeRestrictedInt16uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableRangeRestrictedInt16uWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113482,27 +113482,27 @@ - (void)subscribeAttributeNullableRangeRestrictedInt16uWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableRangeRestrictedInt16uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableRangeRestrictedInt16uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableRangeRestrictedInt16uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeNullableRangeRestrictedInt16sWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableRangeRestrictedInt16sWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeNullableRangeRestrictedInt16sWithValue:(NSNumber * _Nullable)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113525,27 +113525,27 @@ - (void)subscribeAttributeNullableRangeRestrictedInt16sWithMinInterval:(NSNumber
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeNullableRangeRestrictedInt16sWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeNullableRangeRestrictedInt16sWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeNullableRangeRestrictedInt16sWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                                  ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                                  }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeWriteOnlyInt8uWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWriteOnlyInt8uWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)writeAttributeWriteOnlyInt8uWithValue:(NSNumber * _Nonnull)value completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -113568,27 +113568,27 @@ - (void)subscribeAttributeWriteOnlyInt8uWithMinInterval:(NSNumber * _Nonnull)min
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeWriteOnlyInt8uWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeWriteOnlyInt8uWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeWriteOnlyInt8uWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                   ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                   }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeGeneratedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                        params:(MTRSubscribeParams * _Nullable)params
@@ -113603,27 +113603,27 @@ - (void)subscribeAttributeGeneratedCommandListWithMinInterval:(NSNumber * _Nonnu
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeGeneratedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                      ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                      }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeGeneratedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeGeneratedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                         ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                         }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAcceptedCommandListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                       params:(MTRSubscribeParams * _Nullable)params
@@ -113638,27 +113638,27 @@ - (void)subscribeAttributeAcceptedCommandListWithMinInterval:(NSNumber * _Nonnul
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAcceptedCommandListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                     ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                     }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAcceptedCommandListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAcceptedCommandListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                        ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                        }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeAttributeListWithCompletionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithCompletion:
-              ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSArray *>(value), error);
-              }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                 params:(MTRSubscribeParams * _Nullable)params
@@ -113673,27 +113673,27 @@ - (void)subscribeAttributeAttributeListWithMinInterval:(NSNumber * _Nonnull)minI
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeAttributeListWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                               ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   reportHandler(static_cast<NSArray *>(value), error);
-                                                                                                                               }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 + (void)readAttributeAttributeListWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeAttributeListWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                  ^(NSArray * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<NSArray *>(value), error);
-                                                                                                                                  }];
+            ^(NSArray * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSArray *>(value), error);
+            }];
 }
 
 - (void)readAttributeFeatureMapWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                              params:(MTRSubscribeParams * _Nullable)params
@@ -113708,27 +113708,27 @@ - (void)subscribeAttributeFeatureMapWithMinInterval:(NSNumber * _Nonnull)minInte
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeFeatureMapWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                            }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeFeatureMapWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeFeatureMapWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                               ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                               }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (void)readAttributeClusterRevisionWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithCompletion:
-              ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                  // Cast is safe because subclass does not add any selectors.
-                  completionHandler(static_cast<NSNumber *>(value), error);
-              }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)minInterval maxInterval:(NSNumber * _Nonnull)maxInterval
                                                   params:(MTRSubscribeParams * _Nullable)params
@@ -113743,18 +113743,18 @@ - (void)subscribeAttributeClusterRevisionWithMinInterval:(NSNumber * _Nonnull)mi
         subscribeParams.maxInterval = maxInterval;
     }
     [self subscribeAttributeClusterRevisionWithParams:subscribeParams subscriptionEstablished:subscriptionEstablishedHandler reportHandler:
-                                                                                                                                 ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     reportHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                 }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                reportHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 + (void)readAttributeClusterRevisionWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
 {
     [self readAttributeClusterRevisionWithClusterStateCache:attributeCacheContainer.realContainer endpoint:endpoint queue:queue completion:
-                                                                                                                                    ^(NSNumber * _Nullable value, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<NSNumber *>(value), error);
-                                                                                                                                    }];
+            ^(NSNumber * _Nullable value, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<NSNumber *>(value), error);
+            }];
 }
 
 - (nullable instancetype)initWithDevice:(MTRBaseDevice *)device
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index fb882995a229e6..2ce4294c736a71 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -160,12 +160,12 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)identifyWithParams:(MTRIdentifyClusterIdentifyParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self identifyWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                   completionHandler];
+            completionHandler];
 }
 - (void)triggerEffectWithParams:(MTRIdentifyClusterTriggerEffectParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self triggerEffectWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        completionHandler];
+            completionHandler];
 }
 @end
 
@@ -384,39 +384,39 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)addGroupWithParams:(MTRGroupsClusterAddGroupParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self addGroupWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                   ^(MTRGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<MTRGroupsClusterAddGroupResponseParams *>(data), error);
-                                                                                                                                   }];
+            ^(MTRGroupsClusterAddGroupResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupsClusterAddGroupResponseParams *>(data), error);
+            }];
 }
 - (void)viewGroupWithParams:(MTRGroupsClusterViewGroupParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self viewGroupWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                    ^(MTRGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<MTRGroupsClusterViewGroupResponseParams *>(data), error);
-                                                                                                                                    }];
+            ^(MTRGroupsClusterViewGroupResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupsClusterViewGroupResponseParams *>(data), error);
+            }];
 }
 - (void)getGroupMembershipWithParams:(MTRGroupsClusterGetGroupMembershipParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getGroupMembershipWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             ^(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<MTRGroupsClusterGetGroupMembershipResponseParams *>(data), error);
-                                                                                                                                             }];
+            ^(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupsClusterGetGroupMembershipResponseParams *>(data), error);
+            }];
 }
 - (void)removeGroupWithParams:(MTRGroupsClusterRemoveGroupParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGroupsClusterRemoveGroupResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self removeGroupWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      ^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<MTRGroupsClusterRemoveGroupResponseParams *>(data), error);
-                                                                                                                                      }];
+            ^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupsClusterRemoveGroupResponseParams *>(data), error);
+            }];
 }
 - (void)removeAllGroupsWithParams:(MTRGroupsClusterRemoveAllGroupsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self removeAllGroupsWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                          completionHandler];
+            completionHandler];
 }
 - (void)removeAllGroupsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -425,7 +425,7 @@ - (void)removeAllGroupsWithExpectedValues:(NSArray<NSDictionary<NSString *, id>
 - (void)addGroupIfIdentifyingWithParams:(MTRGroupsClusterAddGroupIfIdentifyingParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self addGroupIfIdentifyingWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                completionHandler];
+            completionHandler];
 }
 @end
 
@@ -709,7 +709,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)offWithParams:(MTROnOffClusterOffParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self offWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                              completionHandler];
+            completionHandler];
 }
 - (void)offWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -718,7 +718,7 @@ - (void)offWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullab
 - (void)onWithParams:(MTROnOffClusterOnParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self onWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                             completionHandler];
+            completionHandler];
 }
 - (void)onWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -727,7 +727,7 @@ - (void)onWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullabl
 - (void)toggleWithParams:(MTROnOffClusterToggleParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self toggleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                 completionHandler];
+            completionHandler];
 }
 - (void)toggleWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -736,12 +736,12 @@ - (void)toggleWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nul
 - (void)offWithEffectWithParams:(MTROnOffClusterOffWithEffectParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self offWithEffectWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        completionHandler];
+            completionHandler];
 }
 - (void)onWithRecallGlobalSceneWithParams:(MTROnOffClusterOnWithRecallGlobalSceneParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self onWithRecallGlobalSceneWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                  completionHandler];
+            completionHandler];
 }
 - (void)onWithRecallGlobalSceneWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -750,7 +750,7 @@ - (void)onWithRecallGlobalSceneWithExpectedValues:(NSArray<NSDictionary<NSString
 - (void)onWithTimedOffWithParams:(MTROnOffClusterOnWithTimedOffParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self onWithTimedOffWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                         completionHandler];
+            completionHandler];
 }
 @end
 
@@ -1188,47 +1188,47 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)moveToLevelWithParams:(MTRLevelControlClusterMoveToLevelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToLevelWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 - (void)moveWithParams:(MTRLevelControlClusterMoveParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                               completionHandler];
+            completionHandler];
 }
 - (void)stepWithParams:(MTRLevelControlClusterStepParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                               completionHandler];
+            completionHandler];
 }
 - (void)stopWithParams:(MTRLevelControlClusterStopParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stopWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                               completionHandler];
+            completionHandler];
 }
 - (void)moveToLevelWithOnOffWithParams:(MTRLevelControlClusterMoveToLevelWithOnOffParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToLevelWithOnOffWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                               completionHandler];
+            completionHandler];
 }
 - (void)moveWithOnOffWithParams:(MTRLevelControlClusterMoveWithOnOffParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveWithOnOffWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        completionHandler];
+            completionHandler];
 }
 - (void)stepWithOnOffWithParams:(MTRLevelControlClusterStepWithOnOffParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepWithOnOffWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        completionHandler];
+            completionHandler];
 }
 - (void)stopWithOnOffWithParams:(MTRLevelControlClusterStopWithOnOffParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stopWithOnOffWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        completionHandler];
+            completionHandler];
 }
 - (void)moveToClosestFrequencyWithParams:(MTRLevelControlClusterMoveToClosestFrequencyParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToClosestFrequencyWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                 completionHandler];
+            completionHandler];
 }
 @end
 
@@ -1919,62 +1919,62 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)instantActionWithParams:(MTRActionsClusterInstantActionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self instantActionWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        completionHandler];
+            completionHandler];
 }
 - (void)instantActionWithTransitionWithParams:(MTRActionsClusterInstantActionWithTransitionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self instantActionWithTransitionWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                      completionHandler];
+            completionHandler];
 }
 - (void)startActionWithParams:(MTRActionsClusterStartActionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self startActionWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 - (void)startActionWithDurationWithParams:(MTRActionsClusterStartActionWithDurationParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self startActionWithDurationWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                  completionHandler];
+            completionHandler];
 }
 - (void)stopActionWithParams:(MTRActionsClusterStopActionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stopActionWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                     completionHandler];
+            completionHandler];
 }
 - (void)pauseActionWithParams:(MTRActionsClusterPauseActionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self pauseActionWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 - (void)pauseActionWithDurationWithParams:(MTRActionsClusterPauseActionWithDurationParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self pauseActionWithDurationWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                  completionHandler];
+            completionHandler];
 }
 - (void)resumeActionWithParams:(MTRActionsClusterResumeActionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self resumeActionWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       completionHandler];
+            completionHandler];
 }
 - (void)enableActionWithParams:(MTRActionsClusterEnableActionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enableActionWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       completionHandler];
+            completionHandler];
 }
 - (void)enableActionWithDurationWithParams:(MTRActionsClusterEnableActionWithDurationParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enableActionWithDurationWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                   completionHandler];
+            completionHandler];
 }
 - (void)disableActionWithParams:(MTRActionsClusterDisableActionParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self disableActionWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        completionHandler];
+            completionHandler];
 }
 - (void)disableActionWithDurationWithParams:(MTRActionsClusterDisableActionWithDurationParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self disableActionWithDurationWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                    completionHandler];
+            completionHandler];
 }
 @end
 
@@ -2203,7 +2203,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)mfgSpecificPingWithParams:(MTRBasicClusterMfgSpecificPingParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self mfgSpecificPingWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                          completionHandler];
+            completionHandler];
 }
 - (void)mfgSpecificPingWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -2338,23 +2338,23 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)queryImageWithParams:(MTROtaSoftwareUpdateProviderClusterQueryImageParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTROtaSoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self queryImageWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                     ^(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<MTROtaSoftwareUpdateProviderClusterQueryImageResponseParams *>(data), error);
-                                                                                                                                     }];
+            ^(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROtaSoftwareUpdateProviderClusterQueryImageResponseParams *>(data), error);
+            }];
 }
 - (void)applyUpdateRequestWithParams:(MTROtaSoftwareUpdateProviderClusterApplyUpdateRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTROtaSoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self applyUpdateRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             ^(MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<MTROtaSoftwareUpdateProviderClusterApplyUpdateResponseParams *>(data), error);
-                                                                                                                                             }];
+            ^(MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROtaSoftwareUpdateProviderClusterApplyUpdateResponseParams *>(data), error);
+            }];
 }
 - (void)notifyUpdateAppliedWithParams:(MTROtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self notifyUpdateAppliedWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                              completionHandler];
+            completionHandler];
 }
 @end
 
@@ -2462,7 +2462,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)announceOtaProviderWithParams:(MTROtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self announceOTAProviderWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                              completionHandler];
+            completionHandler];
 }
 - (NSDictionary<NSString *, id> *)readAttributeDefaultOtaProvidersWithParams:(MTRReadParams * _Nullable)params
 {
@@ -3144,26 +3144,26 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)armFailSafeWithParams:(MTRGeneralCommissioningClusterArmFailSafeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self armFailSafeWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<MTRGeneralCommissioningClusterArmFailSafeResponseParams *>(data), error);
-                                                                                                                                      }];
+            ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGeneralCommissioningClusterArmFailSafeResponseParams *>(data), error);
+            }];
 }
 - (void)setRegulatoryConfigWithParams:(MTRGeneralCommissioningClusterSetRegulatoryConfigParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self setRegulatoryConfigWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                              ^(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams *>(data), error);
-                                                                                                                                              }];
+            ^(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams *>(data), error);
+            }];
 }
 - (void)commissioningCompleteWithParams:(MTRGeneralCommissioningClusterCommissioningCompleteParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self commissioningCompleteWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                ^(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                    completionHandler(static_cast<MTRGeneralCommissioningClusterCommissioningCompleteResponseParams *>(data), error);
-                                                                                                                                                }];
+            ^(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGeneralCommissioningClusterCommissioningCompleteResponseParams *>(data), error);
+            }];
 }
 - (void)commissioningCompleteWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -3474,50 +3474,50 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)scanNetworksWithParams:(MTRNetworkCommissioningClusterScanNetworksParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self scanNetworksWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       ^(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<MTRNetworkCommissioningClusterScanNetworksResponseParams *>(data), error);
-                                                                                                                                       }];
+            ^(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterScanNetworksResponseParams *>(data), error);
+            }];
 }
 - (void)addOrUpdateWiFiNetworkWithParams:(MTRNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self addOrUpdateWiFiNetworkWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                 ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                     completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
-                                                                                                                                                 }];
+            ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
+            }];
 }
 - (void)addOrUpdateThreadNetworkWithParams:(MTRNetworkCommissioningClusterAddOrUpdateThreadNetworkParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self addOrUpdateThreadNetworkWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                   ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                       completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
-                                                                                                                                                   }];
+            ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
+            }];
 }
 - (void)removeNetworkWithParams:(MTRNetworkCommissioningClusterRemoveNetworkParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self removeNetworkWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
-                                                                                                                                        }];
+            ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
+            }];
 }
 - (void)connectNetworkWithParams:(MTRNetworkCommissioningClusterConnectNetworkParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self connectNetworkWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                         ^(MTRNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<MTRNetworkCommissioningClusterConnectNetworkResponseParams *>(data), error);
-                                                                                                                                         }];
+            ^(MTRNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterConnectNetworkResponseParams *>(data), error);
+            }];
 }
 - (void)reorderNetworkWithParams:(MTRNetworkCommissioningClusterReorderNetworkParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self reorderNetworkWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                         ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
-                                                                                                                                         }];
+            ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRNetworkCommissioningClusterNetworkConfigResponseParams *>(data), error);
+            }];
 }
 @end
 
@@ -3592,10 +3592,10 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)retrieveLogsRequestWithParams:(MTRDiagnosticLogsClusterRetrieveLogsRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self retrieveLogsRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                              ^(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<MTRDiagnosticLogsClusterRetrieveLogsResponseParams *>(data), error);
-                                                                                                                                              }];
+            ^(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDiagnosticLogsClusterRetrieveLogsResponseParams *>(data), error);
+            }];
 }
 @end
 
@@ -3773,7 +3773,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)testEventTriggerWithParams:(MTRGeneralDiagnosticsClusterTestEventTriggerParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self testEventTriggerWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                           completionHandler];
+            completionHandler];
 }
 - (NSDictionary<NSString *, id> *)readAttributeBootReasonsWithParams:(MTRReadParams * _Nullable)params
 {
@@ -3876,7 +3876,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)resetWatermarksWithParams:(MTRSoftwareDiagnosticsClusterResetWatermarksParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self resetWatermarksWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                          completionHandler];
+            completionHandler];
 }
 - (void)resetWatermarksWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -4274,7 +4274,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)resetCountsWithParams:(MTRThreadNetworkDiagnosticsClusterResetCountsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self resetCountsWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -4430,7 +4430,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)resetCountsWithParams:(MTRWiFiNetworkDiagnosticsClusterResetCountsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self resetCountsWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -4566,7 +4566,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)resetCountsWithParams:(MTREthernetNetworkDiagnosticsClusterResetCountsParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self resetCountsWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 - (void)resetCountsWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -5187,17 +5187,17 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)openCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterOpenCommissioningWindowParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self openCommissioningWindowWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                  completionHandler];
+            completionHandler];
 }
 - (void)openBasicCommissioningWindowWithParams:(MTRAdministratorCommissioningClusterOpenBasicCommissioningWindowParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self openBasicCommissioningWindowWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                       completionHandler];
+            completionHandler];
 }
 - (void)revokeCommissioningWithParams:(MTRAdministratorCommissioningClusterRevokeCommissioningParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self revokeCommissioningWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                              completionHandler];
+            completionHandler];
 }
 - (void)revokeCommissioningWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -5495,63 +5495,63 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)attestationRequestWithParams:(MTROperationalCredentialsClusterAttestationRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self attestationRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             ^(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<MTROperationalCredentialsClusterAttestationResponseParams *>(data), error);
-                                                                                                                                             }];
+            ^(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterAttestationResponseParams *>(data), error);
+            }];
 }
 - (void)certificateChainRequestWithParams:(MTROperationalCredentialsClusterCertificateChainRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTROperationalCredentialsClusterCertificateChainResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self certificateChainRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                  ^(MTROperationalCredentialsClusterCertificateChainResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<MTROperationalCredentialsClusterCertificateChainResponseParams *>(data), error);
-                                                                                                                                                  }];
+            ^(MTROperationalCredentialsClusterCertificateChainResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterCertificateChainResponseParams *>(data), error);
+            }];
 }
 - (void)CSRRequestWithParams:(MTROperationalCredentialsClusterCSRRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTROperationalCredentialsClusterCSRResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self CSRRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                     ^(MTROperationalCredentialsClusterCSRResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<MTROperationalCredentialsClusterCSRResponseParams *>(data), error);
-                                                                                                                                     }];
+            ^(MTROperationalCredentialsClusterCSRResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterCSRResponseParams *>(data), error);
+            }];
 }
 - (void)addNOCWithParams:(MTROperationalCredentialsClusterAddNOCParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self addNOCWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                 ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
-                                                                                                                                 }];
+            ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
+            }];
 }
 - (void)updateNOCWithParams:(MTROperationalCredentialsClusterUpdateNOCParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self updateNOCWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
-                                                                                                                                    }];
+            ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
+            }];
 }
 - (void)updateFabricLabelWithParams:(MTROperationalCredentialsClusterUpdateFabricLabelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self updateFabricLabelWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                            ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
-                                                                                                                                            }];
+            ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
+            }];
 }
 - (void)removeFabricWithParams:(MTROperationalCredentialsClusterRemoveFabricParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self removeFabricWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
-                                                                                                                                       }];
+            ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTROperationalCredentialsClusterNOCResponseParams *>(data), error);
+            }];
 }
 - (void)addTrustedRootCertificateWithParams:(MTROperationalCredentialsClusterAddTrustedRootCertificateParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self addTrustedRootCertificateWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                    completionHandler];
+            completionHandler];
 }
 @end
 
@@ -5742,28 +5742,28 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)keySetWriteWithParams:(MTRGroupKeyManagementClusterKeySetWriteParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self keySetWriteWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 - (void)keySetReadWithParams:(MTRGroupKeyManagementClusterKeySetReadParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self keySetReadWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                     ^(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                         // Cast is safe because subclass does not add any selectors.
-                                                                                                                                         completionHandler(static_cast<MTRGroupKeyManagementClusterKeySetReadResponseParams *>(data), error);
-                                                                                                                                     }];
+            ^(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupKeyManagementClusterKeySetReadResponseParams *>(data), error);
+            }];
 }
 - (void)keySetRemoveWithParams:(MTRGroupKeyManagementClusterKeySetRemoveParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self keySetRemoveWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       completionHandler];
+            completionHandler];
 }
 - (void)keySetReadAllIndicesWithParams:(MTRGroupKeyManagementClusterKeySetReadAllIndicesParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self keySetReadAllIndicesWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                               ^(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                   completionHandler(static_cast<MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams *>(data), error);
-                                                                                                                                               }];
+            ^(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams *>(data), error);
+            }];
 }
 @end
 
@@ -6717,7 +6717,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self changeToModeWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       completionHandler];
+            completionHandler];
 }
 @end
 
@@ -11867,110 +11867,110 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self lockDoorWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                   completionHandler];
+            completionHandler];
 }
 - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self unlockDoorWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                     completionHandler];
+            completionHandler];
 }
 - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self unlockWithTimeoutWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                            completionHandler];
+            completionHandler];
 }
 - (void)setWeekDayScheduleWithParams:(MTRDoorLockClusterSetWeekDayScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setWeekDayScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             completionHandler];
+            completionHandler];
 }
 - (void)getWeekDayScheduleWithParams:(MTRDoorLockClusterGetWeekDayScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getWeekDayScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<MTRDoorLockClusterGetWeekDayScheduleResponseParams *>(data), error);
-                                                                                                                                             }];
+            ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterGetWeekDayScheduleResponseParams *>(data), error);
+            }];
 }
 - (void)clearWeekDayScheduleWithParams:(MTRDoorLockClusterClearWeekDayScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearWeekDayScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                               completionHandler];
+            completionHandler];
 }
 - (void)setYearDayScheduleWithParams:(MTRDoorLockClusterSetYearDayScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setYearDayScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             completionHandler];
+            completionHandler];
 }
 - (void)getYearDayScheduleWithParams:(MTRDoorLockClusterGetYearDayScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getYearDayScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<MTRDoorLockClusterGetYearDayScheduleResponseParams *>(data), error);
-                                                                                                                                             }];
+            ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterGetYearDayScheduleResponseParams *>(data), error);
+            }];
 }
 - (void)clearYearDayScheduleWithParams:(MTRDoorLockClusterClearYearDayScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearYearDayScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                               completionHandler];
+            completionHandler];
 }
 - (void)setHolidayScheduleWithParams:(MTRDoorLockClusterSetHolidayScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setHolidayScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             completionHandler];
+            completionHandler];
 }
 - (void)getHolidayScheduleWithParams:(MTRDoorLockClusterGetHolidayScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getHolidayScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                 completionHandler(static_cast<MTRDoorLockClusterGetHolidayScheduleResponseParams *>(data), error);
-                                                                                                                                             }];
+            ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterGetHolidayScheduleResponseParams *>(data), error);
+            }];
 }
 - (void)clearHolidayScheduleWithParams:(MTRDoorLockClusterClearHolidayScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearHolidayScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                               completionHandler];
+            completionHandler];
 }
 - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setUserWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                  completionHandler];
+            completionHandler];
 }
 - (void)getUserWithParams:(MTRDoorLockClusterGetUserParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getUserWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                  ^(MTRDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<MTRDoorLockClusterGetUserResponseParams *>(data), error);
-                                                                                                                                  }];
+            ^(MTRDoorLockClusterGetUserResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterGetUserResponseParams *>(data), error);
+            }];
 }
 - (void)clearUserWithParams:(MTRDoorLockClusterClearUserParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearUserWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                    completionHandler];
+            completionHandler];
 }
 - (void)setCredentialWithParams:(MTRDoorLockClusterSetCredentialParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRDoorLockClusterSetCredentialResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self setCredentialWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<MTRDoorLockClusterSetCredentialResponseParams *>(data), error);
-                                                                                                                                        }];
+            ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterSetCredentialResponseParams *>(data), error);
+            }];
 }
 - (void)getCredentialStatusWithParams:(MTRDoorLockClusterGetCredentialStatusParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getCredentialStatusWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                              ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                  completionHandler(static_cast<MTRDoorLockClusterGetCredentialStatusResponseParams *>(data), error);
-                                                                                                                                              }];
+            ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRDoorLockClusterGetCredentialStatusResponseParams *>(data), error);
+            }];
 }
 - (void)clearCredentialWithParams:(MTRDoorLockClusterClearCredentialParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearCredentialWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                          completionHandler];
+            completionHandler];
 }
 @end
 
@@ -12340,7 +12340,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)upOrOpenWithParams:(MTRWindowCoveringClusterUpOrOpenParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self upOrOpenWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                   completionHandler];
+            completionHandler];
 }
 - (void)upOrOpenWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -12349,7 +12349,7 @@ - (void)upOrOpenWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _N
 - (void)downOrCloseWithParams:(MTRWindowCoveringClusterDownOrCloseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self downOrCloseWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 - (void)downOrCloseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -12358,7 +12358,7 @@ - (void)downOrCloseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *
 - (void)stopMotionWithParams:(MTRWindowCoveringClusterStopMotionParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stopMotionWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                     completionHandler];
+            completionHandler];
 }
 - (void)stopMotionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -12367,22 +12367,22 @@ - (void)stopMotionWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *
 - (void)goToLiftValueWithParams:(MTRWindowCoveringClusterGoToLiftValueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self goToLiftValueWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        completionHandler];
+            completionHandler];
 }
 - (void)goToLiftPercentageWithParams:(MTRWindowCoveringClusterGoToLiftPercentageParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self goToLiftPercentageWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             completionHandler];
+            completionHandler];
 }
 - (void)goToTiltValueWithParams:(MTRWindowCoveringClusterGoToTiltValueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self goToTiltValueWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        completionHandler];
+            completionHandler];
 }
 - (void)goToTiltPercentageWithParams:(MTRWindowCoveringClusterGoToTiltPercentageParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self goToTiltPercentageWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             completionHandler];
+            completionHandler];
 }
 @end
 
@@ -13562,25 +13562,25 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)setpointRaiseLowerWithParams:(MTRThermostatClusterSetpointRaiseLowerParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setpointRaiseLowerWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             completionHandler];
+            completionHandler];
 }
 - (void)setWeeklyScheduleWithParams:(MTRThermostatClusterSetWeeklyScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self setWeeklyScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                            completionHandler];
+            completionHandler];
 }
 - (void)getWeeklyScheduleWithParams:(MTRThermostatClusterGetWeeklyScheduleParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getWeeklyScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                            ^(MTRThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                completionHandler(static_cast<MTRThermostatClusterGetWeeklyScheduleResponseParams *>(data), error);
-                                                                                                                                            }];
+            ^(MTRThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRThermostatClusterGetWeeklyScheduleResponseParams *>(data), error);
+            }];
 }
 - (void)clearWeeklyScheduleWithParams:(MTRThermostatClusterClearWeeklyScheduleParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self clearWeeklyScheduleWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                              completionHandler];
+            completionHandler];
 }
 - (void)clearWeeklyScheduleWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -14846,97 +14846,97 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)moveToHueWithParams:(MTRColorControlClusterMoveToHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToHueWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                    completionHandler];
+            completionHandler];
 }
 - (void)moveHueWithParams:(MTRColorControlClusterMoveHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveHueWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                  completionHandler];
+            completionHandler];
 }
 - (void)stepHueWithParams:(MTRColorControlClusterStepHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepHueWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                  completionHandler];
+            completionHandler];
 }
 - (void)moveToSaturationWithParams:(MTRColorControlClusterMoveToSaturationParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToSaturationWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                           completionHandler];
+            completionHandler];
 }
 - (void)moveSaturationWithParams:(MTRColorControlClusterMoveSaturationParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveSaturationWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                         completionHandler];
+            completionHandler];
 }
 - (void)stepSaturationWithParams:(MTRColorControlClusterStepSaturationParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepSaturationWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                         completionHandler];
+            completionHandler];
 }
 - (void)moveToHueAndSaturationWithParams:(MTRColorControlClusterMoveToHueAndSaturationParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToHueAndSaturationWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                 completionHandler];
+            completionHandler];
 }
 - (void)moveToColorWithParams:(MTRColorControlClusterMoveToColorParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToColorWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 - (void)moveColorWithParams:(MTRColorControlClusterMoveColorParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveColorWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                    completionHandler];
+            completionHandler];
 }
 - (void)stepColorWithParams:(MTRColorControlClusterStepColorParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepColorWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                    completionHandler];
+            completionHandler];
 }
 - (void)moveToColorTemperatureWithParams:(MTRColorControlClusterMoveToColorTemperatureParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveToColorTemperatureWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                 completionHandler];
+            completionHandler];
 }
 - (void)enhancedMoveToHueWithParams:(MTRColorControlClusterEnhancedMoveToHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enhancedMoveToHueWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                            completionHandler];
+            completionHandler];
 }
 - (void)enhancedMoveHueWithParams:(MTRColorControlClusterEnhancedMoveHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enhancedMoveHueWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                          completionHandler];
+            completionHandler];
 }
 - (void)enhancedStepHueWithParams:(MTRColorControlClusterEnhancedStepHueParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enhancedStepHueWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                          completionHandler];
+            completionHandler];
 }
 - (void)enhancedMoveToHueAndSaturationWithParams:(MTRColorControlClusterEnhancedMoveToHueAndSaturationParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self enhancedMoveToHueAndSaturationWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                         completionHandler];
+            completionHandler];
 }
 - (void)colorLoopSetWithParams:(MTRColorControlClusterColorLoopSetParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self colorLoopSetWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       completionHandler];
+            completionHandler];
 }
 - (void)stopMoveStepWithParams:(MTRColorControlClusterStopMoveStepParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stopMoveStepWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       completionHandler];
+            completionHandler];
 }
 - (void)moveColorTemperatureWithParams:(MTRColorControlClusterMoveColorTemperatureParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self moveColorTemperatureWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                               completionHandler];
+            completionHandler];
 }
 - (void)stepColorTemperatureWithParams:(MTRColorControlClusterStepColorTemperatureParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self stepColorTemperatureWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                               completionHandler];
+            completionHandler];
 }
 @end
 
@@ -17351,20 +17351,20 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)changeChannelWithParams:(MTRChannelClusterChangeChannelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRChannelClusterChangeChannelResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self changeChannelWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        ^(MTRChannelClusterChangeChannelResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<MTRChannelClusterChangeChannelResponseParams *>(data), error);
-                                                                                                                                        }];
+            ^(MTRChannelClusterChangeChannelResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRChannelClusterChangeChannelResponseParams *>(data), error);
+            }];
 }
 - (void)changeChannelByNumberWithParams:(MTRChannelClusterChangeChannelByNumberParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self changeChannelByNumberWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                completionHandler];
+            completionHandler];
 }
 - (void)skipChannelWithParams:(MTRChannelClusterSkipChannelParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self skipChannelWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 @end
 
@@ -17449,10 +17449,10 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)navigateTargetWithParams:(MTRTargetNavigatorClusterNavigateTargetParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self navigateTargetWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                         ^(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                             completionHandler(static_cast<MTRTargetNavigatorClusterNavigateTargetResponseParams *>(data), error);
-                                                                                                                                         }];
+            ^(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTargetNavigatorClusterNavigateTargetResponseParams *>(data), error);
+            }];
 }
 @end
 
@@ -17969,10 +17969,10 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)playWithParams:(MTRMediaPlaybackClusterPlayParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self playWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                               ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                                                                                                               }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)playWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -17981,10 +17981,10 @@ - (void)playWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nulla
 - (void)pauseWithParams:(MTRMediaPlaybackClusterPauseParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self pauseWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                    // Cast is safe because subclass does not add any selectors.
-                                                                                                                                    completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                                                                                                                }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -17993,10 +17993,10 @@ - (void)pauseWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Null
 - (void)stopPlaybackWithParams:(MTRMediaPlaybackClusterStopPlaybackParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self stopWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                               ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                                                                                                               }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)stopPlaybackWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -18005,10 +18005,10 @@ - (void)stopPlaybackWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *>
 - (void)startOverWithParams:(MTRMediaPlaybackClusterStartOverParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self startOverWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                                                                                                                    }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)startOverWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -18017,10 +18017,10 @@ - (void)startOverWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _
 - (void)previousWithParams:(MTRMediaPlaybackClusterPreviousParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self previousWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                   ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                       completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                                                                                                                   }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)previousWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -18029,10 +18029,10 @@ - (void)previousWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _N
 - (void)nextWithParams:(MTRMediaPlaybackClusterNextParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self nextWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                               ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                                                                                                               }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)nextWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -18041,10 +18041,10 @@ - (void)nextWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nulla
 - (void)rewindWithParams:(MTRMediaPlaybackClusterRewindParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self rewindWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                 ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                     // Cast is safe because subclass does not add any selectors.
-                                                                                                                                     completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                                                                                                                 }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)rewindWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -18053,10 +18053,10 @@ - (void)rewindWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nul
 - (void)fastForwardWithParams:(MTRMediaPlaybackClusterFastForwardParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self fastForwardWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                                                                                                                      }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)fastForwardWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -18065,26 +18065,26 @@ - (void)fastForwardWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> *
 - (void)skipForwardWithParams:(MTRMediaPlaybackClusterSkipForwardParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self skipForwardWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                                                                                                                      }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)skipBackwardWithParams:(MTRMediaPlaybackClusterSkipBackwardParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self skipBackwardWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                                                                                                                       }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 - (void)seekWithParams:(MTRMediaPlaybackClusterSeekParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self seekWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                               ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                   completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
-                                                                                                                               }];
+            ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRMediaPlaybackClusterPlaybackResponseParams *>(data), error);
+            }];
 }
 @end
 
@@ -18258,12 +18258,12 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)selectInputWithParams:(MTRMediaInputClusterSelectInputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self selectInputWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 - (void)showInputStatusWithParams:(MTRMediaInputClusterShowInputStatusParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self showInputStatusWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                          completionHandler];
+            completionHandler];
 }
 - (void)showInputStatusWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -18272,7 +18272,7 @@ - (void)showInputStatusWithExpectedValues:(NSArray<NSDictionary<NSString *, id>
 - (void)hideInputStatusWithParams:(MTRMediaInputClusterHideInputStatusParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self hideInputStatusWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                          completionHandler];
+            completionHandler];
 }
 - (void)hideInputStatusWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -18281,7 +18281,7 @@ - (void)hideInputStatusWithExpectedValues:(NSArray<NSDictionary<NSString *, id>
 - (void)renameInputWithParams:(MTRMediaInputClusterRenameInputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self renameInputWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      completionHandler];
+            completionHandler];
 }
 @end
 
@@ -18360,7 +18360,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)sleepWithParams:(MTRLowPowerClusterSleepParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self sleepWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                completionHandler];
+            completionHandler];
 }
 - (void)sleepWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -18439,10 +18439,10 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)sendKeyWithParams:(MTRKeypadInputClusterSendKeyParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self sendKeyWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                  ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<MTRKeypadInputClusterSendKeyResponseParams *>(data), error);
-                                                                                                                                  }];
+            ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRKeypadInputClusterSendKeyResponseParams *>(data), error);
+            }];
 }
 @end
 
@@ -18565,18 +18565,18 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)launchContentWithParams:(MTRContentLauncherClusterLaunchContentParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self launchContentWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                        ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                            completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
-                                                                                                                                        }];
+            ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
+            }];
 }
 - (void)launchURLWithParams:(MTRContentLauncherClusterLaunchURLParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRContentLauncherClusterLaunchResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self launchURLWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                    ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
-                                                                                                                                    }];
+            ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRContentLauncherClusterLaunchResponseParams *>(data), error);
+            }];
 }
 @end
 
@@ -18688,12 +18688,12 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)selectOutputWithParams:(MTRAudioOutputClusterSelectOutputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self selectOutputWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       completionHandler];
+            completionHandler];
 }
 - (void)renameOutputWithParams:(MTRAudioOutputClusterRenameOutputParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self renameOutputWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       completionHandler];
+            completionHandler];
 }
 @end
 
@@ -18855,26 +18855,26 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)launchAppWithParams:(MTRApplicationLauncherClusterLaunchAppParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self launchAppWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                    ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                        completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
-                                                                                                                                    }];
+            ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
+            }];
 }
 - (void)stopAppWithParams:(MTRApplicationLauncherClusterStopAppParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self stopAppWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                  ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
-                                                                                                                                  }];
+            ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
+            }];
 }
 - (void)hideAppWithParams:(MTRApplicationLauncherClusterHideAppParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self hideAppWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                  ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                      completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
-                                                                                                                                  }];
+            ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRApplicationLauncherClusterLauncherResponseParams *>(data), error);
+            }];
 }
 @end
 
@@ -19099,20 +19099,20 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)getSetupPINWithParams:(MTRAccountLoginClusterGetSetupPINParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self getSetupPINWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                      ^(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                          completionHandler(static_cast<MTRAccountLoginClusterGetSetupPINResponseParams *>(data), error);
-                                                                                                                                      }];
+            ^(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRAccountLoginClusterGetSetupPINResponseParams *>(data), error);
+            }];
 }
 - (void)loginWithParams:(MTRAccountLoginClusterLoginParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self loginWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                completionHandler];
+            completionHandler];
 }
 - (void)logoutWithParams:(MTRAccountLoginClusterLogoutParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self logoutWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                 completionHandler];
+            completionHandler];
 }
 - (void)logoutWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -21919,7 +21919,7 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpoint:(uint16_t)endpoint q
 - (void)testWithParams:(MTRTestClusterClusterTestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self testWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                               completionHandler];
+            completionHandler];
 }
 - (void)testWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -21928,7 +21928,7 @@ - (void)testWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nulla
 - (void)testNotHandledWithParams:(MTRTestClusterClusterTestNotHandledParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self testNotHandledWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                         completionHandler];
+            completionHandler];
 }
 - (void)testNotHandledWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -21937,10 +21937,10 @@ - (void)testNotHandledWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *
 - (void)testSpecificWithParams:(MTRTestClusterClusterTestSpecificParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestSpecificResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testSpecificWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                       ^(MTRUnitTestingClusterTestSpecificResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                           completionHandler(static_cast<MTRTestClusterClusterTestSpecificResponseParams *>(data), error);
-                                                                                                                                       }];
+            ^(MTRUnitTestingClusterTestSpecificResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestSpecificResponseParams *>(data), error);
+            }];
 }
 - (void)testSpecificWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestSpecificResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -21949,7 +21949,7 @@ - (void)testSpecificWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *>
 - (void)testUnknownCommandWithParams:(MTRTestClusterClusterTestUnknownCommandParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self testUnknownCommandWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             completionHandler];
+            completionHandler];
 }
 - (void)testUnknownCommandWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -21958,98 +21958,98 @@ - (void)testUnknownCommandWithExpectedValues:(NSArray<NSDictionary<NSString *, i
 - (void)testAddArgumentsWithParams:(MTRTestClusterClusterTestAddArgumentsParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestAddArgumentsResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testAddArgumentsWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                           ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<MTRTestClusterClusterTestAddArgumentsResponseParams *>(data), error);
-                                                                                                                                           }];
+            ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestAddArgumentsResponseParams *>(data), error);
+            }];
 }
 - (void)testSimpleArgumentRequestWithParams:(MTRTestClusterClusterTestSimpleArgumentRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestSimpleArgumentResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testSimpleArgumentRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                    ^(MTRUnitTestingClusterTestSimpleArgumentResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                        completionHandler(static_cast<MTRTestClusterClusterTestSimpleArgumentResponseParams *>(data), error);
-                                                                                                                                                    }];
+            ^(MTRUnitTestingClusterTestSimpleArgumentResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestSimpleArgumentResponseParams *>(data), error);
+            }];
 }
 - (void)testStructArrayArgumentRequestWithParams:(MTRTestClusterClusterTestStructArrayArgumentRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestStructArrayArgumentResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testStructArrayArgumentRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                         ^(MTRUnitTestingClusterTestStructArrayArgumentResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                             // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                             completionHandler(static_cast<MTRTestClusterClusterTestStructArrayArgumentResponseParams *>(data), error);
-                                                                                                                                                         }];
+            ^(MTRUnitTestingClusterTestStructArrayArgumentResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestStructArrayArgumentResponseParams *>(data), error);
+            }];
 }
 - (void)testStructArgumentRequestWithParams:(MTRTestClusterClusterTestStructArgumentRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testStructArgumentRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                    ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                        // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                        completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                                                                                                                    }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testNestedStructArgumentRequestWithParams:(MTRTestClusterClusterTestNestedStructArgumentRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testNestedStructArgumentRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                          ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                              // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                              completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                                                                                                                          }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testListStructArgumentRequestWithParams:(MTRTestClusterClusterTestListStructArgumentRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testListStructArgumentRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                        ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                            // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                            completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                                                                                                                        }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testListInt8UArgumentRequestWithParams:(MTRTestClusterClusterTestListInt8UArgumentRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testListInt8UArgumentRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                       ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                           // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                           completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                                                                                                                       }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testNestedStructListArgumentRequestWithParams:(MTRTestClusterClusterTestNestedStructListArgumentRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testNestedStructListArgumentRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                              ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                                  // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                                  completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                                                                                                                              }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testListNestedStructListArgumentRequestWithParams:(MTRTestClusterClusterTestListNestedStructListArgumentRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testListNestedStructListArgumentRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                                  ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                                      completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
-                                                                                                                                                                  }];
+            ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterBooleanResponseParams *>(data), error);
+            }];
 }
 - (void)testListInt8UReverseRequestWithParams:(MTRTestClusterClusterTestListInt8UReverseRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestListInt8UReverseResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testListInt8UReverseRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                      ^(MTRUnitTestingClusterTestListInt8UReverseResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                          completionHandler(static_cast<MTRTestClusterClusterTestListInt8UReverseResponseParams *>(data), error);
-                                                                                                                                                      }];
+            ^(MTRUnitTestingClusterTestListInt8UReverseResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestListInt8UReverseResponseParams *>(data), error);
+            }];
 }
 - (void)testEnumsRequestWithParams:(MTRTestClusterClusterTestEnumsRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestEnumsResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testEnumsRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                           ^(MTRUnitTestingClusterTestEnumsResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                               // Cast is safe because subclass does not add any selectors.
-                                                                                                                                               completionHandler(static_cast<MTRTestClusterClusterTestEnumsResponseParams *>(data), error);
-                                                                                                                                           }];
+            ^(MTRUnitTestingClusterTestEnumsResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestEnumsResponseParams *>(data), error);
+            }];
 }
 - (void)testNullableOptionalRequestWithParams:(MTRTestClusterClusterTestNullableOptionalRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testNullableOptionalRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                      ^(MTRUnitTestingClusterTestNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                          // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                          completionHandler(static_cast<MTRTestClusterClusterTestNullableOptionalResponseParams *>(data), error);
-                                                                                                                                                      }];
+            ^(MTRUnitTestingClusterTestNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestNullableOptionalResponseParams *>(data), error);
+            }];
 }
 - (void)testNullableOptionalRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
@@ -22058,23 +22058,23 @@ - (void)testNullableOptionalRequestWithExpectedValues:(NSArray<NSDictionary<NSSt
 - (void)testComplexNullableOptionalRequestWithParams:(MTRTestClusterClusterTestComplexNullableOptionalRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestComplexNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testComplexNullableOptionalRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                             ^(MTRUnitTestingClusterTestComplexNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                                 // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                                 completionHandler(static_cast<MTRTestClusterClusterTestComplexNullableOptionalResponseParams *>(data), error);
-                                                                                                                                                             }];
+            ^(MTRUnitTestingClusterTestComplexNullableOptionalResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestComplexNullableOptionalResponseParams *>(data), error);
+            }];
 }
 - (void)simpleStructEchoRequestWithParams:(MTRTestClusterClusterSimpleStructEchoRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterSimpleStructResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self simpleStructEchoRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                  ^(MTRUnitTestingClusterSimpleStructResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                      // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                      completionHandler(static_cast<MTRTestClusterClusterSimpleStructResponseParams *>(data), error);
-                                                                                                                                                  }];
+            ^(MTRUnitTestingClusterSimpleStructResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterSimpleStructResponseParams *>(data), error);
+            }];
 }
 - (void)timedInvokeRequestWithParams:(MTRTestClusterClusterTimedInvokeRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self timedInvokeRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                             completionHandler];
+            completionHandler];
 }
 - (void)timedInvokeRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -22083,7 +22083,7 @@ - (void)timedInvokeRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, i
 - (void)testSimpleOptionalArgumentRequestWithParams:(MTRTestClusterClusterTestSimpleOptionalArgumentRequestParams * _Nullable)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
     [self testSimpleOptionalArgumentRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                            completionHandler];
+            completionHandler];
 }
 - (void)testSimpleOptionalArgumentRequestWithExpectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(MTRStatusCompletion)completionHandler
 {
@@ -22092,18 +22092,18 @@ - (void)testSimpleOptionalArgumentRequestWithExpectedValues:(NSArray<NSDictionar
 - (void)testEmitTestEventRequestWithParams:(MTRTestClusterClusterTestEmitTestEventRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestEmitTestEventResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testEmitTestEventRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                   ^(MTRUnitTestingClusterTestEmitTestEventResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                       // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                       completionHandler(static_cast<MTRTestClusterClusterTestEmitTestEventResponseParams *>(data), error);
-                                                                                                                                                   }];
+            ^(MTRUnitTestingClusterTestEmitTestEventResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestEmitTestEventResponseParams *>(data), error);
+            }];
 }
 - (void)testEmitTestFabricScopedEventRequestWithParams:(MTRTestClusterClusterTestEmitTestFabricScopedEventRequestParams *)params expectedValues:(NSArray<NSDictionary<NSString *, id> *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completionHandler:(void (^)(MTRTestClusterClusterTestEmitTestFabricScopedEventResponseParams * _Nullable data, NSError * _Nullable error))completionHandler
 {
     [self testEmitTestFabricScopedEventRequestWithParams:params expectedValues:expectedDataValueDictionaries expectedValueInterval:expectedValueIntervalMs completion:
-                                                                                                                                                               ^(MTRUnitTestingClusterTestEmitTestFabricScopedEventResponseParams * _Nullable data, NSError * _Nullable error) {
-                                                                                                                                                                   // Cast is safe because subclass does not add any selectors.
-                                                                                                                                                                   completionHandler(static_cast<MTRTestClusterClusterTestEmitTestFabricScopedEventResponseParams *>(data), error);
-                                                                                                                                                               }];
+            ^(MTRUnitTestingClusterTestEmitTestFabricScopedEventResponseParams * _Nullable data, NSError * _Nullable error) {
+                // Cast is safe because subclass does not add any selectors.
+                completionHandler(static_cast<MTRTestClusterClusterTestEmitTestFabricScopedEventResponseParams *>(data), error);
+            }];
 }
 @end
 
diff --git a/src/lib/support/JniTypeWrappers.h b/src/lib/support/JniTypeWrappers.h
index 883b9228482b39..593ae4f38f9c66 100644
--- a/src/lib/support/JniTypeWrappers.h
+++ b/src/lib/support/JniTypeWrappers.h
@@ -56,10 +56,10 @@ class JniUtfString
     jsize size() const { return mDataLength; }
 
 private:
-    JNIEnv * mEnv;
-    jstring mString;
-    const char * mChars;
-    jsize mDataLength;
+    JNIEnv * mEnv       = nullptr;
+    jstring mString     = nullptr;
+    const char * mChars = nullptr;
+    jsize mDataLength   = 0;
 };
 
 /// Exposes the underlying binary data from a jni byte array
diff --git a/src/messaging/tests/MessagingContext.h b/src/messaging/tests/MessagingContext.h
index 2b3058a8771515..c71061a611b58b 100644
--- a/src/messaging/tests/MessagingContext.h
+++ b/src/messaging/tests/MessagingContext.h
@@ -220,6 +220,10 @@ class LoopbackMessagingContext : public ::testing::Test, public MessagingContext
 public:
     virtual ~LoopbackMessagingContext() {}
 
+    // Pigweed test pure virtual will get overriden
+    // TODO: why is a context a Test?
+    virtual void PigweedTestBody() {}
+
     // These functions wrap spLoopbackTransportManager methods
     static auto & GetSystemLayer() { return spLoopbackTransportManager->GetSystemLayer(); }
     static auto & GetLoopback() { return spLoopbackTransportManager->GetLoopback(); }
diff --git a/src/messaging/tests/java/BUILD.gn b/src/messaging/tests/java/BUILD.gn
index 2a1ae118670852..c33257846ca8f5 100644
--- a/src/messaging/tests/java/BUILD.gn
+++ b/src/messaging/tests/java/BUILD.gn
@@ -14,6 +14,7 @@
 
 import("//build_overrides/build.gni")
 import("//build_overrides/chip.gni")
+import("//build_overrides/pigweed.gni")
 import("${chip_root}/build/chip/java/config.gni")
 import("${chip_root}/build/chip/java/rules.gni")
 
@@ -28,6 +29,7 @@ shared_library("jni") {
   deps = [
     "${chip_root}/src/messaging/tests:helpers",
     "${chip_root}/src/platform/logging:default",
+    dir_pw_unit_test,
   ]
 
   public_configs = [ "${chip_root}/src:includes" ]
diff --git a/src/messaging/tests/java/MessagingContext-JNI.cpp b/src/messaging/tests/java/MessagingContext-JNI.cpp
index 0c3b40a2221edd..bd93c56dcdc43f 100644
--- a/src/messaging/tests/java/MessagingContext-JNI.cpp
+++ b/src/messaging/tests/java/MessagingContext-JNI.cpp
@@ -33,13 +33,7 @@ JNI_METHOD(jlong, MessagingContext, newMessagingContext)
 {
     LoopbackMessagingContext * messagingContext = chip::Platform::New<LoopbackMessagingContext>();
     messagingContext->ConfigInitializeNodes(initializeNodes != JNI_FALSE);
-    CHIP_ERROR err = messagingContext->Init();
-    if (err != CHIP_NO_ERROR)
-    {
-        jclass exceptionCls = env->FindClass("chip/platform/AndroidChipPlatformException");
-        JniReferences::GetInstance().ThrowError(env, exceptionCls, err);
-        return 0;
-    }
+    messagingContext->SetUp();
 
     MessagingContext * messagingContextResult = messagingContext;
     return reinterpret_cast<jlong>(messagingContextResult);
@@ -48,8 +42,8 @@ JNI_METHOD(jlong, MessagingContext, newMessagingContext)
 JNI_METHOD(void, MessagingContext, deleteMessagingContext)
 (JNIEnv * env, jobject self, jlong contextHandle)
 {
-    MessagingContext * messagingContext = reinterpret_cast<MessagingContext *>(contextHandle);
+    LoopbackMessagingContext * messagingContext = reinterpret_cast<LoopbackMessagingContext *>(contextHandle);
     VerifyOrReturn(messagingContext != nullptr, ChipLogError(Test, "MessagingContext handle is nullptr"));
-    messagingContext->Shutdown();
+    messagingContext->TearDown();
     delete messagingContext;
 }
diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
index fc68f13a3ab4bf..d379bd0e1f4e0d 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -143,6 +143,8 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
       "CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF=${chip_device_config_enable_wifipaf}",
     ]
 
+    public_deps = [ "${chip_root}/src/app/icd/server:icd-server-config" ]
+
     if (chip_device_platform == "linux" || chip_device_platform == "darwin" ||
         chip_device_platform == "tizen" || chip_device_platform == "android" ||
         chip_device_platform == "webos" || chip_device_platform == "bl602" ||
@@ -306,6 +308,8 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
     } else if (chip_device_platform == "openiotsdk") {
       device_layer_target_define = "OPEN_IOT_SDK"
       defines += [ "CHIP_DEVICE_LAYER_TARGET=openiotsdk" ]
+      public_deps +=
+          [ "${chip_root}/src/platform/openiotsdk:openiotsdk_buildconfig" ]
     } else if (chip_device_platform == "asr") {
       device_layer_target_define = "ASR"
       defines += [ "CHIP_DEVICE_LAYER_TARGET=ASR" ]
diff --git a/third_party/boringssl/repo/BUILD.gn b/third_party/boringssl/repo/BUILD.gn
index 425f52270d2411..a57807f52b4762 100644
--- a/third_party/boringssl/repo/BUILD.gn
+++ b/third_party/boringssl/repo/BUILD.gn
@@ -29,6 +29,7 @@ config("boringssl_config_disable_warnings") {
   cflags = [
     "-Wno-unused-variable",
     "-Wno-conversion",
+    "-Wno-cast-function-type-mismatch",
   ]
 
   if (is_clang) {
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 1f12d06f5133a9..d5fcc90b39ee75 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 1f12d06f5133a9a471e0551e5f915dff80ee908c
+Subproject commit d5fcc90b39ee7568855390535fa854cea8f33c95
diff --git a/third_party/silabs/slc_gen/run_slc.py b/third_party/silabs/slc_gen/run_slc.py
index 22ef27b2c750e6..81e2fe25719fea 100644
--- a/third_party/silabs/slc_gen/run_slc.py
+++ b/third_party/silabs/slc_gen/run_slc.py
@@ -63,11 +63,22 @@ def isMG26(partnumber):
     # If no gsdk path is set in the environment, use the standard path to the submodule
     sisdk_root = os.path.join(root_path, "third_party/silabs/simplicity_sdk/")
 
-# make sure we have a configured and trusted gsdk in slc
-subprocess.run(["slc", "configuration", "--sdk", sisdk_root], check=True)
-subprocess.run(["slc", "signature", "trust", "--sdk", sisdk_root], check=True)
+# SLC needs to run the system python, so we force PATH to have /usr/bin in front
+# This is a workaround for CI builds failing with an odd `jinja2` module error when
+# leaving the default paths enabled
+cmds = f"""
+set -ex
+
+export PATH="/usr/bin:$PATH"
+
+slc configuration --sdk '{sisdk_root}'
+slc signature trust --sdk '{sisdk_root}'
+slc generate '{slcp_file_path}' -d '{output_path}' --with '{slc_arguments}'
+""".strip()
 
-subprocess.run(["slc", "generate", slcp_file_path, "-d", output_path, "--with", slc_arguments], check=True)
+
+# make sure we have a configured and trusted gsdk in slc
+subprocess.run(["bash", "-c", cmds], check=True)
 
 # cleanup of unwanted files
 fileList = glob.glob(os.path.join(output_path, "matter-platform.*"))
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 0f45b57afaf21c..21b8385bdd0004 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -209,17 +209,17 @@ class IdentifyIdentify : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster identifyWithParams:params completion:
-                                                   ^(NSError * _Nullable error) {
-                                                       responsesNeeded--;
-                                                       if (error != nil) {
-                                                           mError = error;
-                                                           LogNSError("Error", error);
-                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                       }
-                                                       if (responsesNeeded == 0) {
-                                                           SetCommandExitStatus(mError);
-                                                       }
-                                                   }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -258,17 +258,17 @@ class IdentifyTriggerEffect : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster triggerEffectWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -1031,23 +1031,23 @@ class GroupsAddGroup : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addGroupWithParams:params completion:
-                                                   ^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                       NSLog(@"Values: %@", values);
-                                                       if (error == nil) {
-                                                           constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::AddGroupResponse::Id;
-                                                           RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                       }
-                                                       responsesNeeded--;
-                                                       if (error != nil) {
-                                                           mError = error;
-                                                           LogNSError("Error", error);
-                                                           constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::AddGroupResponse::Id;
-                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                       }
-                                                       if (responsesNeeded == 0) {
-                                                           SetCommandExitStatus(mError);
-                                                       }
-                                                   }];
+                    ^(MTRGroupsClusterAddGroupResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::AddGroupResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::AddGroupResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -1084,23 +1084,23 @@ class GroupsViewGroup : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster viewGroupWithParams:params completion:
-                                                    ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                        NSLog(@"Values: %@", values);
-                                                        if (error == nil) {
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::ViewGroupResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                        }
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::ViewGroupResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(MTRGroupsClusterViewGroupResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::ViewGroupResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::ViewGroupResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -1146,23 +1146,23 @@ class GroupsGetGroupMembership : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getGroupMembershipWithParams:params completion:
-                                                             ^(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                 NSLog(@"Values: %@", values);
-                                                                 if (error == nil) {
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                 }
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(MTRGroupsClusterGetGroupMembershipResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -1200,23 +1200,23 @@ class GroupsRemoveGroup : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster removeGroupWithParams:params completion:
-                                                      ^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                          NSLog(@"Values: %@", values);
-                                                          if (error == nil) {
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::RemoveGroupResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                          }
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::RemoveGroupResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(MTRGroupsClusterRemoveGroupResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::RemoveGroupResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Groups::Commands::RemoveGroupResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -1251,17 +1251,17 @@ class GroupsRemoveAllGroups : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster removeAllGroupsWithParams:params completion:
-                                                          ^(NSError * _Nullable error) {
-                                                              responsesNeeded--;
-                                                              if (error != nil) {
-                                                                  mError = error;
-                                                                  LogNSError("Error", error);
-                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                              }
-                                                              if (responsesNeeded == 0) {
-                                                                  SetCommandExitStatus(mError);
-                                                              }
-                                                          }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -1299,17 +1299,17 @@ class GroupsAddGroupIfIdentifying : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addGroupIfIdentifyingWithParams:params completion:
-                                                                ^(NSError * _Nullable error) {
-                                                                    responsesNeeded--;
-                                                                    if (error != nil) {
-                                                                        mError = error;
-                                                                        LogNSError("Error", error);
-                                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                    }
-                                                                    if (responsesNeeded == 0) {
-                                                                        SetCommandExitStatus(mError);
-                                                                    }
-                                                                }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -1949,17 +1949,17 @@ class OnOffOff : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster offWithParams:params completion:
-                                              ^(NSError * _Nullable error) {
-                                                  responsesNeeded--;
-                                                  if (error != nil) {
-                                                      mError = error;
-                                                      LogNSError("Error", error);
-                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                  }
-                                                  if (responsesNeeded == 0) {
-                                                      SetCommandExitStatus(mError);
-                                                  }
-                                              }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -1993,17 +1993,17 @@ class OnOffOn : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster onWithParams:params completion:
-                                             ^(NSError * _Nullable error) {
-                                                 responsesNeeded--;
-                                                 if (error != nil) {
-                                                     mError = error;
-                                                     LogNSError("Error", error);
-                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                 }
-                                                 if (responsesNeeded == 0) {
-                                                     SetCommandExitStatus(mError);
-                                                 }
-                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -2037,17 +2037,17 @@ class OnOffToggle : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster toggleWithParams:params completion:
-                                                 ^(NSError * _Nullable error) {
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -2085,17 +2085,17 @@ class OnOffOffWithEffect : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster offWithEffectWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -2130,17 +2130,17 @@ class OnOffOnWithRecallGlobalScene : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster onWithRecallGlobalSceneWithParams:params completion:
-                                                                  ^(NSError * _Nullable error) {
-                                                                      responsesNeeded--;
-                                                                      if (error != nil) {
-                                                                          mError = error;
-                                                                          LogNSError("Error", error);
-                                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                      }
-                                                                      if (responsesNeeded == 0) {
-                                                                          SetCommandExitStatus(mError);
-                                                                      }
-                                                                  }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -2180,17 +2180,17 @@ class OnOffOnWithTimedOff : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster onWithTimedOffWithParams:params completion:
-                                                         ^(NSError * _Nullable error) {
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -3308,17 +3308,17 @@ class LevelControlMoveToLevel : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveToLevelWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -3365,17 +3365,17 @@ class LevelControlMove : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveWithParams:params completion:
-                                               ^(NSError * _Nullable error) {
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -3424,17 +3424,17 @@ class LevelControlStep : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stepWithParams:params completion:
-                                               ^(NSError * _Nullable error) {
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -3473,17 +3473,17 @@ class LevelControlStop : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stopWithParams:params completion:
-                                               ^(NSError * _Nullable error) {
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -3530,17 +3530,17 @@ class LevelControlMoveToLevelWithOnOff : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveToLevelWithOnOffWithParams:params completion:
-                                                               ^(NSError * _Nullable error) {
-                                                                   responsesNeeded--;
-                                                                   if (error != nil) {
-                                                                       mError = error;
-                                                                       LogNSError("Error", error);
-                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                   }
-                                                                   if (responsesNeeded == 0) {
-                                                                       SetCommandExitStatus(mError);
-                                                                   }
-                                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -3587,17 +3587,17 @@ class LevelControlMoveWithOnOff : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveWithOnOffWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -3646,17 +3646,17 @@ class LevelControlStepWithOnOff : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stepWithOnOffWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -3695,17 +3695,17 @@ class LevelControlStopWithOnOff : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stopWithOnOffWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -3742,17 +3742,17 @@ class LevelControlMoveToClosestFrequency : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveToClosestFrequencyWithParams:params completion:
-                                                                 ^(NSError * _Nullable error) {
-                                                                     responsesNeeded--;
-                                                                     if (error != nil) {
-                                                                         mError = error;
-                                                                         LogNSError("Error", error);
-                                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                     }
-                                                                     if (responsesNeeded == 0) {
-                                                                         SetCommandExitStatus(mError);
-                                                                     }
-                                                                 }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -7924,23 +7924,23 @@ class AccessControlReviewFabricRestrictions : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster reviewFabricRestrictionsWithParams:params completion:
-                                                                   ^(MTRAccessControlClusterReviewFabricRestrictionsResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                       NSLog(@"Values: %@", values);
-                                                                       if (error == nil) {
-                                                                           constexpr chip::CommandId responseId = chip::app::Clusters::AccessControl::Commands::ReviewFabricRestrictionsResponse::Id;
-                                                                           RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                       }
-                                                                       responsesNeeded--;
-                                                                       if (error != nil) {
-                                                                           mError = error;
-                                                                           LogNSError("Error", error);
-                                                                           constexpr chip::CommandId responseId = chip::app::Clusters::AccessControl::Commands::ReviewFabricRestrictionsResponse::Id;
-                                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                       }
-                                                                       if (responsesNeeded == 0) {
-                                                                           SetCommandExitStatus(mError);
-                                                                       }
-                                                                   }];
+                    ^(MTRAccessControlClusterReviewFabricRestrictionsResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::AccessControl::Commands::ReviewFabricRestrictionsResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::AccessControl::Commands::ReviewFabricRestrictionsResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9258,17 +9258,17 @@ class ActionsInstantAction : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster instantActionWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9313,17 +9313,17 @@ class ActionsInstantActionWithTransition : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster instantActionWithTransitionWithParams:params completion:
-                                                                      ^(NSError * _Nullable error) {
-                                                                          responsesNeeded--;
-                                                                          if (error != nil) {
-                                                                              mError = error;
-                                                                              LogNSError("Error", error);
-                                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                          }
-                                                                          if (responsesNeeded == 0) {
-                                                                              SetCommandExitStatus(mError);
-                                                                          }
-                                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9366,17 +9366,17 @@ class ActionsStartAction : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster startActionWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9421,17 +9421,17 @@ class ActionsStartActionWithDuration : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster startActionWithDurationWithParams:params completion:
-                                                                  ^(NSError * _Nullable error) {
-                                                                      responsesNeeded--;
-                                                                      if (error != nil) {
-                                                                          mError = error;
-                                                                          LogNSError("Error", error);
-                                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                      }
-                                                                      if (responsesNeeded == 0) {
-                                                                          SetCommandExitStatus(mError);
-                                                                      }
-                                                                  }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9474,17 +9474,17 @@ class ActionsStopAction : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stopActionWithParams:params completion:
-                                                     ^(NSError * _Nullable error) {
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9527,17 +9527,17 @@ class ActionsPauseAction : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster pauseActionWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9582,17 +9582,17 @@ class ActionsPauseActionWithDuration : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster pauseActionWithDurationWithParams:params completion:
-                                                                  ^(NSError * _Nullable error) {
-                                                                      responsesNeeded--;
-                                                                      if (error != nil) {
-                                                                          mError = error;
-                                                                          LogNSError("Error", error);
-                                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                      }
-                                                                      if (responsesNeeded == 0) {
-                                                                          SetCommandExitStatus(mError);
-                                                                      }
-                                                                  }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9635,17 +9635,17 @@ class ActionsResumeAction : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resumeActionWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9688,17 +9688,17 @@ class ActionsEnableAction : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster enableActionWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9743,17 +9743,17 @@ class ActionsEnableActionWithDuration : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster enableActionWithDurationWithParams:params completion:
-                                                                   ^(NSError * _Nullable error) {
-                                                                       responsesNeeded--;
-                                                                       if (error != nil) {
-                                                                           mError = error;
-                                                                           LogNSError("Error", error);
-                                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                       }
-                                                                       if (responsesNeeded == 0) {
-                                                                           SetCommandExitStatus(mError);
-                                                                       }
-                                                                   }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9796,17 +9796,17 @@ class ActionsDisableAction : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster disableActionWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -9851,17 +9851,17 @@ class ActionsDisableActionWithDuration : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster disableActionWithDurationWithParams:params completion:
-                                                                    ^(NSError * _Nullable error) {
-                                                                        responsesNeeded--;
-                                                                        if (error != nil) {
-                                                                            mError = error;
-                                                                            LogNSError("Error", error);
-                                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                        }
-                                                                        if (responsesNeeded == 0) {
-                                                                            SetCommandExitStatus(mError);
-                                                                        }
-                                                                    }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -13254,23 +13254,23 @@ class OtaSoftwareUpdateProviderQueryImage : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster queryImageWithParams:params completion:
-                                                     ^(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                         NSLog(@"Values: %@", values);
-                                                         if (error == nil) {
-                                                             constexpr chip::CommandId responseId = chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::Id;
-                                                             RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                         }
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             constexpr chip::CommandId responseId = chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::Id;
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(MTROTASoftwareUpdateProviderClusterQueryImageResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -13310,23 +13310,23 @@ class OtaSoftwareUpdateProviderApplyUpdateRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster applyUpdateRequestWithParams:params completion:
-                                                             ^(MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                 NSLog(@"Values: %@", values);
-                                                                 if (error == nil) {
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                 }
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(MTROTASoftwareUpdateProviderClusterApplyUpdateResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -13365,17 +13365,17 @@ class OtaSoftwareUpdateProviderNotifyUpdateApplied : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster notifyUpdateAppliedWithParams:params completion:
-                                                              ^(NSError * _Nullable error) {
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -13944,17 +13944,17 @@ class OtaSoftwareUpdateRequestorAnnounceOTAProvider : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster announceOTAProviderWithParams:params completion:
-                                                              ^(NSError * _Nullable error) {
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -20869,23 +20869,23 @@ class GeneralCommissioningArmFailSafe : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster armFailSafeWithParams:params completion:
-                                                      ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                          NSLog(@"Values: %@", values);
-                                                          if (error == nil) {
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                          }
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(MTRGeneralCommissioningClusterArmFailSafeResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -20926,23 +20926,23 @@ class GeneralCommissioningSetRegulatoryConfig : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setRegulatoryConfigWithParams:params completion:
-                                                              ^(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                  NSLog(@"Values: %@", values);
-                                                                  if (error == nil) {
-                                                                      constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::Id;
-                                                                      RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                  }
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::Id;
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+                    ^(MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -20977,23 +20977,23 @@ class GeneralCommissioningCommissioningComplete : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster commissioningCompleteWithParams:params completion:
-                                                                ^(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                    NSLog(@"Values: %@", values);
-                                                                    if (error == nil) {
-                                                                        constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::Id;
-                                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                    }
-                                                                    responsesNeeded--;
-                                                                    if (error != nil) {
-                                                                        mError = error;
-                                                                        LogNSError("Error", error);
-                                                                        constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::Id;
-                                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                    }
-                                                                    if (responsesNeeded == 0) {
-                                                                        SetCommandExitStatus(mError);
-                                                                    }
-                                                                }];
+                    ^(MTRGeneralCommissioningClusterCommissioningCompleteResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -21040,23 +21040,23 @@ class GeneralCommissioningSetTCAcknowledgements : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setTCAcknowledgementsWithParams:params completion:
-                                                                ^(MTRGeneralCommissioningClusterSetTCAcknowledgementsResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                    NSLog(@"Values: %@", values);
-                                                                    if (error == nil) {
-                                                                        constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::SetTCAcknowledgementsResponse::Id;
-                                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                    }
-                                                                    responsesNeeded--;
-                                                                    if (error != nil) {
-                                                                        mError = error;
-                                                                        LogNSError("Error", error);
-                                                                        constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::SetTCAcknowledgementsResponse::Id;
-                                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                    }
-                                                                    if (responsesNeeded == 0) {
-                                                                        SetCommandExitStatus(mError);
-                                                                    }
-                                                                }];
+                    ^(MTRGeneralCommissioningClusterSetTCAcknowledgementsResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::SetTCAcknowledgementsResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralCommissioning::Commands::SetTCAcknowledgementsResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -22431,23 +22431,23 @@ class NetworkCommissioningScanNetworks : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster scanNetworksWithParams:params completion:
-                                                       ^(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRNetworkCommissioningClusterScanNetworksResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -22522,23 +22522,23 @@ class NetworkCommissioningAddOrUpdateWiFiNetwork : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addOrUpdateWiFiNetworkWithParams:params completion:
-                                                                 ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                     NSLog(@"Values: %@", values);
-                                                                     if (error == nil) {
-                                                                         constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
-                                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                     }
-                                                                     responsesNeeded--;
-                                                                     if (error != nil) {
-                                                                         mError = error;
-                                                                         LogNSError("Error", error);
-                                                                         constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
-                                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                     }
-                                                                     if (responsesNeeded == 0) {
-                                                                         SetCommandExitStatus(mError);
-                                                                     }
-                                                                 }];
+                    ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -22581,23 +22581,23 @@ class NetworkCommissioningAddOrUpdateThreadNetwork : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addOrUpdateThreadNetworkWithParams:params completion:
-                                                                   ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                       NSLog(@"Values: %@", values);
-                                                                       if (error == nil) {
-                                                                           constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
-                                                                           RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                       }
-                                                                       responsesNeeded--;
-                                                                       if (error != nil) {
-                                                                           mError = error;
-                                                                           LogNSError("Error", error);
-                                                                           constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
-                                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                       }
-                                                                       if (responsesNeeded == 0) {
-                                                                           SetCommandExitStatus(mError);
-                                                                       }
-                                                                   }];
+                    ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -22640,23 +22640,23 @@ class NetworkCommissioningRemoveNetwork : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster removeNetworkWithParams:params completion:
-                                                        ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                            NSLog(@"Values: %@", values);
-                                                            if (error == nil) {
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                            }
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -22699,23 +22699,23 @@ class NetworkCommissioningConnectNetwork : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster connectNetworkWithParams:params completion:
-                                                         ^(MTRNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                             NSLog(@"Values: %@", values);
-                                                             if (error == nil) {
-                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::Id;
-                                                                 RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                             }
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::Id;
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(MTRNetworkCommissioningClusterConnectNetworkResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::ConnectNetworkResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -22760,23 +22760,23 @@ class NetworkCommissioningReorderNetwork : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster reorderNetworkWithParams:params completion:
-                                                         ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                             NSLog(@"Values: %@", values);
-                                                             if (error == nil) {
-                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
-                                                                 RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                             }
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(MTRNetworkCommissioningClusterNetworkConfigResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::NetworkConfigResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -22828,23 +22828,23 @@ class NetworkCommissioningQueryIdentity : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster queryIdentityWithParams:params completion:
-                                                        ^(MTRNetworkCommissioningClusterQueryIdentityResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                            NSLog(@"Values: %@", values);
-                                                            if (error == nil) {
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                            }
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(MTRNetworkCommissioningClusterQueryIdentityResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::NetworkCommissioning::Commands::QueryIdentityResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -24357,23 +24357,23 @@ class DiagnosticLogsRetrieveLogsRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster retrieveLogsRequestWithParams:params completion:
-                                                              ^(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                  NSLog(@"Values: %@", values);
-                                                                  if (error == nil) {
-                                                                      constexpr chip::CommandId responseId = chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::Id;
-                                                                      RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                  }
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      constexpr chip::CommandId responseId = chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::Id;
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+                    ^(MTRDiagnosticLogsClusterRetrieveLogsResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -24940,17 +24940,17 @@ class GeneralDiagnosticsTestEventTrigger : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testEventTriggerWithParams:params completion:
-                                                           ^(NSError * _Nullable error) {
-                                                               responsesNeeded--;
-                                                               if (error != nil) {
-                                                                   mError = error;
-                                                                   LogNSError("Error", error);
-                                                                   RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                               }
-                                                               if (responsesNeeded == 0) {
-                                                                   SetCommandExitStatus(mError);
-                                                               }
-                                                           }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -24986,23 +24986,23 @@ class GeneralDiagnosticsTimeSnapshot : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster timeSnapshotWithParams:params completion:
-                                                       ^(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -25056,23 +25056,23 @@ class GeneralDiagnosticsPayloadTestRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster payloadTestRequestWithParams:params completion:
-                                                             ^(MTRGeneralDiagnosticsClusterPayloadTestResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                 NSLog(@"Values: %@", values);
-                                                                 if (error == nil) {
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::PayloadTestResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                 }
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::PayloadTestResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(MTRGeneralDiagnosticsClusterPayloadTestResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::PayloadTestResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GeneralDiagnostics::Commands::PayloadTestResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -26365,17 +26365,17 @@ class SoftwareDiagnosticsResetWatermarks : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resetWatermarksWithParams:params completion:
-                                                          ^(NSError * _Nullable error) {
-                                                              responsesNeeded--;
-                                                              if (error != nil) {
-                                                                  mError = error;
-                                                                  LogNSError("Error", error);
-                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                              }
-                                                              if (responsesNeeded == 0) {
-                                                                  SetCommandExitStatus(mError);
-                                                              }
-                                                          }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -27315,17 +27315,17 @@ class ThreadNetworkDiagnosticsResetCounts : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resetCountsWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -33054,17 +33054,17 @@ class WiFiNetworkDiagnosticsResetCounts : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resetCountsWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -34686,17 +34686,17 @@ class EthernetNetworkDiagnosticsResetCounts : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resetCountsWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -36015,17 +36015,17 @@ class TimeSynchronizationSetUTCTime : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setUTCTimeWithParams:params completion:
-                                                     ^(NSError * _Nullable error) {
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -36075,17 +36075,17 @@ class TimeSynchronizationSetTrustedTimeSource : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setTrustedTimeSourceWithParams:params completion:
-                                                               ^(NSError * _Nullable error) {
-                                                                   responsesNeeded--;
-                                                                   if (error != nil) {
-                                                                       mError = error;
-                                                                       LogNSError("Error", error);
-                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                   }
-                                                                   if (responsesNeeded == 0) {
-                                                                       SetCommandExitStatus(mError);
-                                                                   }
-                                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -36145,23 +36145,23 @@ class TimeSynchronizationSetTimeZone : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setTimeZoneWithParams:params completion:
-                                                      ^(MTRTimeSynchronizationClusterSetTimeZoneResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                          NSLog(@"Values: %@", values);
-                                                          if (error == nil) {
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::TimeSynchronization::Commands::SetTimeZoneResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                          }
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::TimeSynchronization::Commands::SetTimeZoneResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(MTRTimeSynchronizationClusterSetTimeZoneResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::TimeSynchronization::Commands::SetTimeZoneResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::TimeSynchronization::Commands::SetTimeZoneResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -36221,17 +36221,17 @@ class TimeSynchronizationSetDSTOffset : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setDSTOffsetWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -36279,17 +36279,17 @@ class TimeSynchronizationSetDefaultNTP : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setDefaultNTPWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -37994,17 +37994,17 @@ class BridgedDeviceBasicInformationKeepActive : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster keepActiveWithParams:params completion:
-                                                     ^(NSError * _Nullable error) {
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -40776,17 +40776,17 @@ class AdministratorCommissioningOpenCommissioningWindow : public ClusterCommand
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster openCommissioningWindowWithParams:params completion:
-                                                                  ^(NSError * _Nullable error) {
-                                                                      responsesNeeded--;
-                                                                      if (error != nil) {
-                                                                          mError = error;
-                                                                          LogNSError("Error", error);
-                                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                      }
-                                                                      if (responsesNeeded == 0) {
-                                                                          SetCommandExitStatus(mError);
-                                                                      }
-                                                                  }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -40823,17 +40823,17 @@ class AdministratorCommissioningOpenBasicCommissioningWindow : public ClusterCom
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster openBasicCommissioningWindowWithParams:params completion:
-                                                                       ^(NSError * _Nullable error) {
-                                                                           responsesNeeded--;
-                                                                           if (error != nil) {
-                                                                               mError = error;
-                                                                               LogNSError("Error", error);
-                                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                           }
-                                                                           if (responsesNeeded == 0) {
-                                                                               SetCommandExitStatus(mError);
-                                                                           }
-                                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -40868,17 +40868,17 @@ class AdministratorCommissioningRevokeCommissioning : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster revokeCommissioningWithParams:params completion:
-                                                              ^(NSError * _Nullable error) {
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -41686,23 +41686,23 @@ class OperationalCredentialsAttestationRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster attestationRequestWithParams:params completion:
-                                                             ^(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                 NSLog(@"Values: %@", values);
-                                                                 if (error == nil) {
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                 }
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(MTROperationalCredentialsClusterAttestationResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -41739,23 +41739,23 @@ class OperationalCredentialsCertificateChainRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster certificateChainRequestWithParams:params completion:
-                                                                  ^(MTROperationalCredentialsClusterCertificateChainResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                      NSLog(@"Values: %@", values);
-                                                                      if (error == nil) {
-                                                                          constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::Id;
-                                                                          RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                      }
-                                                                      responsesNeeded--;
-                                                                      if (error != nil) {
-                                                                          mError = error;
-                                                                          LogNSError("Error", error);
-                                                                          constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::Id;
-                                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                      }
-                                                                      if (responsesNeeded == 0) {
-                                                                          SetCommandExitStatus(mError);
-                                                                      }
-                                                                  }];
+                    ^(MTROperationalCredentialsClusterCertificateChainResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -41798,23 +41798,23 @@ class OperationalCredentialsCSRRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster CSRRequestWithParams:params completion:
-                                                     ^(MTROperationalCredentialsClusterCSRResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                         NSLog(@"Values: %@", values);
-                                                         if (error == nil) {
-                                                             constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::Id;
-                                                             RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                         }
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::Id;
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(MTROperationalCredentialsClusterCSRResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::CSRResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -41863,23 +41863,23 @@ class OperationalCredentialsAddNOC : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addNOCWithParams:params completion:
-                                                 ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                     NSLog(@"Values: %@", values);
-                                                     if (error == nil) {
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                     }
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
+                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -41922,23 +41922,23 @@ class OperationalCredentialsUpdateNOC : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster updateNOCWithParams:params completion:
-                                                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                        NSLog(@"Values: %@", values);
-                                                        if (error == nil) {
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                        }
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -41975,23 +41975,23 @@ class OperationalCredentialsUpdateFabricLabel : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster updateFabricLabelWithParams:params completion:
-                                                            ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                NSLog(@"Values: %@", values);
-                                                                if (error == nil) {
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                }
-                                                                responsesNeeded--;
-                                                                if (error != nil) {
-                                                                    mError = error;
-                                                                    LogNSError("Error", error);
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                }
-                                                                if (responsesNeeded == 0) {
-                                                                    SetCommandExitStatus(mError);
-                                                                }
-                                                            }];
+                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -42028,23 +42028,23 @@ class OperationalCredentialsRemoveFabric : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster removeFabricWithParams:params completion:
-                                                       ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTROperationalCredentialsClusterNOCResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -42081,17 +42081,17 @@ class OperationalCredentialsAddTrustedRootCertificate : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addTrustedRootCertificateWithParams:params completion:
-                                                                    ^(NSError * _Nullable error) {
-                                                                        responsesNeeded--;
-                                                                        if (error != nil) {
-                                                                            mError = error;
-                                                                            LogNSError("Error", error);
-                                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                        }
-                                                                        if (responsesNeeded == 0) {
-                                                                            SetCommandExitStatus(mError);
-                                                                        }
-                                                                    }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -43181,17 +43181,17 @@ class GroupKeyManagementKeySetWrite : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster keySetWriteWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -43229,23 +43229,23 @@ class GroupKeyManagementKeySetRead : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster keySetReadWithParams:params completion:
-                                                     ^(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                         NSLog(@"Values: %@", values);
-                                                         if (error == nil) {
-                                                             constexpr chip::CommandId responseId = chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::Id;
-                                                             RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                         }
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             constexpr chip::CommandId responseId = chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::Id;
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(MTRGroupKeyManagementClusterKeySetReadResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -43282,17 +43282,17 @@ class GroupKeyManagementKeySetRemove : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster keySetRemoveWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -43327,23 +43327,23 @@ class GroupKeyManagementKeySetReadAllIndices : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster keySetReadAllIndicesWithParams:params completion:
-                                                               ^(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                   NSLog(@"Values: %@", values);
-                                                                   if (error == nil) {
-                                                                       constexpr chip::CommandId responseId = chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::Id;
-                                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                   }
-                                                                   responsesNeeded--;
-                                                                   if (error != nil) {
-                                                                       mError = error;
-                                                                       LogNSError("Error", error);
-                                                                       constexpr chip::CommandId responseId = chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::Id;
-                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                   }
-                                                                   if (responsesNeeded == 0) {
-                                                                       SetCommandExitStatus(mError);
-                                                                   }
-                                                               }];
+                    ^(MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::GroupKeyManagement::Commands::KeySetReadAllIndicesResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -46169,23 +46169,23 @@ class IcdManagementRegisterClient : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster registerClientWithParams:params completion:
-                                                         ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                             NSLog(@"Values: %@", values);
-                                                             if (error == nil) {
-                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::IcdManagement::Commands::RegisterClientResponse::Id;
-                                                                 RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                             }
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::IcdManagement::Commands::RegisterClientResponse::Id;
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(MTRICDManagementClusterRegisterClientResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::IcdManagement::Commands::RegisterClientResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::IcdManagement::Commands::RegisterClientResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -46238,17 +46238,17 @@ class IcdManagementUnregisterClient : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster unregisterClientWithParams:params completion:
-                                                           ^(NSError * _Nullable error) {
-                                                               responsesNeeded--;
-                                                               if (error != nil) {
-                                                                   mError = error;
-                                                                   LogNSError("Error", error);
-                                                                   RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                               }
-                                                               if (responsesNeeded == 0) {
-                                                                   SetCommandExitStatus(mError);
-                                                               }
-                                                           }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -46291,23 +46291,23 @@ class IcdManagementStayActiveRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stayActiveRequestWithParams:params completion:
-                                                            ^(MTRICDManagementClusterStayActiveResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                NSLog(@"Values: %@", values);
-                                                                if (error == nil) {
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                }
-                                                                responsesNeeded--;
-                                                                if (error != nil) {
-                                                                    mError = error;
-                                                                    LogNSError("Error", error);
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                }
-                                                                if (responsesNeeded == 0) {
-                                                                    SetCommandExitStatus(mError);
-                                                                }
-                                                            }];
+                    ^(MTRICDManagementClusterStayActiveResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::IcdManagement::Commands::StayActiveResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -47740,17 +47740,17 @@ class TimerSetTimer : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setTimerWithParams:params completion:
-                                                   ^(NSError * _Nullable error) {
-                                                       responsesNeeded--;
-                                                       if (error != nil) {
-                                                           mError = error;
-                                                           LogNSError("Error", error);
-                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                       }
-                                                       if (responsesNeeded == 0) {
-                                                           SetCommandExitStatus(mError);
-                                                       }
-                                                   }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -47787,17 +47787,17 @@ class TimerResetTimer : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resetTimerWithParams:params completion:
-                                                     ^(NSError * _Nullable error) {
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -47839,17 +47839,17 @@ class TimerAddTime : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addTimeWithParams:params completion:
-                                                  ^(NSError * _Nullable error) {
-                                                      responsesNeeded--;
-                                                      if (error != nil) {
-                                                          mError = error;
-                                                          LogNSError("Error", error);
-                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                      }
-                                                      if (responsesNeeded == 0) {
-                                                          SetCommandExitStatus(mError);
-                                                      }
-                                                  }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -47892,17 +47892,17 @@ class TimerReduceTime : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster reduceTimeWithParams:params completion:
-                                                     ^(NSError * _Nullable error) {
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -48735,23 +48735,23 @@ class OvenCavityOperationalStatePause : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster pauseWithParams:params completion:
-                                                ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                    NSLog(@"Values: %@", values);
-                                                    if (error == nil) {
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                    }
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+                    ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -48787,23 +48787,23 @@ class OvenCavityOperationalStateStop : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stopWithParams:params completion:
-                                               ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                   NSLog(@"Values: %@", values);
-                                                   if (error == nil) {
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                   }
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -48839,23 +48839,23 @@ class OvenCavityOperationalStateStart : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster startWithParams:params completion:
-                                                ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                    NSLog(@"Values: %@", values);
-                                                    if (error == nil) {
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                    }
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+                    ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -48891,23 +48891,23 @@ class OvenCavityOperationalStateResume : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resumeWithParams:params completion:
-                                                 ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                     NSLog(@"Values: %@", values);
-                                                     if (error == nil) {
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                     }
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
+                    ^(MTROvenCavityOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OvenCavityOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -49993,23 +49993,23 @@ class OvenModeChangeToMode : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTROvenModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTROvenModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OvenMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -51754,17 +51754,17 @@ class ModeSelectChangeToMode : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -52904,23 +52904,23 @@ class LaundryWasherModeChangeToMode : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRLaundryWasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -53925,23 +53925,23 @@ class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public Clust
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -55895,23 +55895,23 @@ class RvcRunModeChangeToMode : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRRVCRunModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -56627,23 +56627,23 @@ class RvcCleanModeChangeToMode : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRRVCCleanModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -57383,17 +57383,17 @@ class TemperatureControlSetTemperature : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setTemperatureWithParams:params completion:
-                                                         ^(NSError * _Nullable error) {
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -59267,23 +59267,23 @@ class DishwasherModeChangeToMode : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRDishwasherModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -60895,17 +60895,17 @@ class SmokeCoAlarmSelfTestRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster selfTestRequestWithParams:params completion:
-                                                          ^(NSError * _Nullable error) {
-                                                              responsesNeeded--;
-                                                              if (error != nil) {
-                                                                  mError = error;
-                                                                  LogNSError("Error", error);
-                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                              }
-                                                              if (responsesNeeded == 0) {
-                                                                  SetCommandExitStatus(mError);
-                                                              }
-                                                          }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -62573,17 +62573,17 @@ class DishwasherAlarmReset : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resetWithParams:params completion:
-                                                ^(NSError * _Nullable error) {
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -62626,17 +62626,17 @@ class DishwasherAlarmModifyEnabledAlarms : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster modifyEnabledAlarmsWithParams:params completion:
-                                                              ^(NSError * _Nullable error) {
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -64303,17 +64303,17 @@ class MicrowaveOvenControlSetCookingParameters : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setCookingParametersWithParams:params completion:
-                                                               ^(NSError * _Nullable error) {
-                                                                   responsesNeeded--;
-                                                                   if (error != nil) {
-                                                                       mError = error;
-                                                                       LogNSError("Error", error);
-                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                   }
-                                                                   if (responsesNeeded == 0) {
-                                                                       SetCommandExitStatus(mError);
-                                                                   }
-                                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -64356,17 +64356,17 @@ class MicrowaveOvenControlAddMoreTime : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addMoreTimeWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -65707,23 +65707,23 @@ class OperationalStatePause : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster pauseWithParams:params completion:
-                                                ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                    NSLog(@"Values: %@", values);
-                                                    if (error == nil) {
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                    }
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+                    ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -65757,23 +65757,23 @@ class OperationalStateStop : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stopWithParams:params completion:
-                                               ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                   NSLog(@"Values: %@", values);
-                                                   if (error == nil) {
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                   }
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -65807,23 +65807,23 @@ class OperationalStateStart : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster startWithParams:params completion:
-                                                ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                    NSLog(@"Values: %@", values);
-                                                    if (error == nil) {
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                    }
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+                    ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -65857,23 +65857,23 @@ class OperationalStateResume : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resumeWithParams:params completion:
-                                                 ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                     NSLog(@"Values: %@", values);
-                                                     if (error == nil) {
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                     }
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
+                    ^(MTROperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -66922,23 +66922,23 @@ class RvcOperationalStatePause : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster pauseWithParams:params completion:
-                                                ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                    NSLog(@"Values: %@", values);
-                                                    if (error == nil) {
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                    }
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+                    ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -66972,23 +66972,23 @@ class RvcOperationalStateResume : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resumeWithParams:params completion:
-                                                 ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                     NSLog(@"Values: %@", values);
-                                                     if (error == nil) {
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                     }
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
+                    ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -67023,23 +67023,23 @@ class RvcOperationalStateGoHome : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster goHomeWithParams:params completion:
-                                                 ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                     NSLog(@"Values: %@", values);
-                                                     if (error == nil) {
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                     }
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
+                    ^(MTRRVCOperationalStateClusterOperationalCommandResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::RvcOperationalState::Commands::OperationalCommandResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -68182,23 +68182,23 @@ class ScenesManagementAddScene : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addSceneWithParams:params completion:
-                                                   ^(MTRScenesManagementClusterAddSceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                       NSLog(@"Values: %@", values);
-                                                       if (error == nil) {
-                                                           constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::AddSceneResponse::Id;
-                                                           RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                       }
-                                                       responsesNeeded--;
-                                                       if (error != nil) {
-                                                           mError = error;
-                                                           LogNSError("Error", error);
-                                                           constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::AddSceneResponse::Id;
-                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                       }
-                                                       if (responsesNeeded == 0) {
-                                                           SetCommandExitStatus(mError);
-                                                       }
-                                                   }];
+                    ^(MTRScenesManagementClusterAddSceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::AddSceneResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::AddSceneResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -68248,23 +68248,23 @@ class ScenesManagementViewScene : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster viewSceneWithParams:params completion:
-                                                    ^(MTRScenesManagementClusterViewSceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                        NSLog(@"Values: %@", values);
-                                                        if (error == nil) {
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::ViewSceneResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                        }
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::ViewSceneResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(MTRScenesManagementClusterViewSceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::ViewSceneResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::ViewSceneResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -68313,23 +68313,23 @@ class ScenesManagementRemoveScene : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster removeSceneWithParams:params completion:
-                                                      ^(MTRScenesManagementClusterRemoveSceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                          NSLog(@"Values: %@", values);
-                                                          if (error == nil) {
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::RemoveSceneResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                          }
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::RemoveSceneResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(MTRScenesManagementClusterRemoveSceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::RemoveSceneResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::RemoveSceneResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -68372,23 +68372,23 @@ class ScenesManagementRemoveAllScenes : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster removeAllScenesWithParams:params completion:
-                                                          ^(MTRScenesManagementClusterRemoveAllScenesResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                              NSLog(@"Values: %@", values);
-                                                              if (error == nil) {
-                                                                  constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::RemoveAllScenesResponse::Id;
-                                                                  RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                              }
-                                                              responsesNeeded--;
-                                                              if (error != nil) {
-                                                                  mError = error;
-                                                                  LogNSError("Error", error);
-                                                                  constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::RemoveAllScenesResponse::Id;
-                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                              }
-                                                              if (responsesNeeded == 0) {
-                                                                  SetCommandExitStatus(mError);
-                                                              }
-                                                          }];
+                    ^(MTRScenesManagementClusterRemoveAllScenesResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::RemoveAllScenesResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::RemoveAllScenesResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -68437,23 +68437,23 @@ class ScenesManagementStoreScene : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster storeSceneWithParams:params completion:
-                                                     ^(MTRScenesManagementClusterStoreSceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                         NSLog(@"Values: %@", values);
-                                                         if (error == nil) {
-                                                             constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::StoreSceneResponse::Id;
-                                                             RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                         }
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::StoreSceneResponse::Id;
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(MTRScenesManagementClusterStoreSceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::StoreSceneResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::StoreSceneResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -68516,17 +68516,17 @@ class ScenesManagementRecallScene : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster recallSceneWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -68569,23 +68569,23 @@ class ScenesManagementGetSceneMembership : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getSceneMembershipWithParams:params completion:
-                                                             ^(MTRScenesManagementClusterGetSceneMembershipResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                 NSLog(@"Values: %@", values);
-                                                                 if (error == nil) {
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::GetSceneMembershipResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                 }
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::GetSceneMembershipResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(MTRScenesManagementClusterGetSceneMembershipResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::GetSceneMembershipResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::GetSceneMembershipResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -68652,23 +68652,23 @@ class ScenesManagementCopyScene : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster copySceneWithParams:params completion:
-                                                    ^(MTRScenesManagementClusterCopySceneResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                        NSLog(@"Values: %@", values);
-                                                        if (error == nil) {
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::CopySceneResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                        }
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::CopySceneResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(MTRScenesManagementClusterCopySceneResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::CopySceneResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ScenesManagement::Commands::CopySceneResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -69498,17 +69498,17 @@ class HepaFilterMonitoringResetCondition : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resetConditionWithParams:params completion:
-                                                         ^(NSError * _Nullable error) {
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -70597,17 +70597,17 @@ class ActivatedCarbonFilterMonitoringResetCondition : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resetConditionWithParams:params completion:
-                                                         ^(NSError * _Nullable error) {
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -71703,17 +71703,17 @@ class BooleanStateConfigurationSuppressAlarm : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster suppressAlarmWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -71750,17 +71750,17 @@ class BooleanStateConfigurationEnableDisableAlarm : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster enableDisableAlarmWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -73035,17 +73035,17 @@ class ValveConfigurationAndControlOpen : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster openWithParams:params completion:
-                                               ^(NSError * _Nullable error) {
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -73080,17 +73080,17 @@ class ValveConfigurationAndControlClose : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster closeWithParams:params completion:
-                                                ^(NSError * _Nullable error) {
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -77770,17 +77770,17 @@ class WaterHeaterManagementBoost : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster boostWithParams:params completion:
-                                                ^(NSError * _Nullable error) {
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -77818,17 +77818,17 @@ class WaterHeaterManagementCancelBoost : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster cancelBoostWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -78941,17 +78941,17 @@ class DemandResponseLoadControlRegisterLoadControlProgramRequest : public Cluste
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster registerLoadControlProgramRequestWithParams:params completion:
-                                                                            ^(NSError * _Nullable error) {
-                                                                                responsesNeeded--;
-                                                                                if (error != nil) {
-                                                                                    mError = error;
-                                                                                    LogNSError("Error", error);
-                                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                                }
-                                                                                if (responsesNeeded == 0) {
-                                                                                    SetCommandExitStatus(mError);
-                                                                                }
-                                                                            }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -78995,17 +78995,17 @@ class DemandResponseLoadControlUnregisterLoadControlProgramRequest : public Clus
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster unregisterLoadControlProgramRequestWithParams:params completion:
-                                                                              ^(NSError * _Nullable error) {
-                                                                                  responsesNeeded--;
-                                                                                  if (error != nil) {
-                                                                                      mError = error;
-                                                                                      LogNSError("Error", error);
-                                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                                  }
-                                                                                  if (responsesNeeded == 0) {
-                                                                                      SetCommandExitStatus(mError);
-                                                                                  }
-                                                                              }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -79144,17 +79144,17 @@ class DemandResponseLoadControlAddLoadControlEventRequest : public ClusterComman
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addLoadControlEventRequestWithParams:params completion:
-                                                                     ^(NSError * _Nullable error) {
-                                                                         responsesNeeded--;
-                                                                         if (error != nil) {
-                                                                             mError = error;
-                                                                             LogNSError("Error", error);
-                                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                         }
-                                                                         if (responsesNeeded == 0) {
-                                                                             SetCommandExitStatus(mError);
-                                                                         }
-                                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -79204,17 +79204,17 @@ class DemandResponseLoadControlRemoveLoadControlEventRequest : public ClusterCom
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster removeLoadControlEventRequestWithParams:params completion:
-                                                                        ^(NSError * _Nullable error) {
-                                                                            responsesNeeded--;
-                                                                            if (error != nil) {
-                                                                                mError = error;
-                                                                                LogNSError("Error", error);
-                                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                            }
-                                                                            if (responsesNeeded == 0) {
-                                                                                SetCommandExitStatus(mError);
-                                                                            }
-                                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -79251,17 +79251,17 @@ class DemandResponseLoadControlClearLoadControlEventsRequest : public ClusterCom
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster clearLoadControlEventsRequestWithParams:params completion:
-                                                                        ^(NSError * _Nullable error) {
-                                                                            responsesNeeded--;
-                                                                            if (error != nil) {
-                                                                                mError = error;
-                                                                                LogNSError("Error", error);
-                                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                            }
-                                                                            if (responsesNeeded == 0) {
-                                                                                SetCommandExitStatus(mError);
-                                                                            }
-                                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -80668,17 +80668,17 @@ class MessagesPresentMessagesRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster presentMessagesRequestWithParams:params completion:
-                                                                 ^(NSError * _Nullable error) {
-                                                                     responsesNeeded--;
-                                                                     if (error != nil) {
-                                                                         mError = error;
-                                                                         LogNSError("Error", error);
-                                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                     }
-                                                                     if (responsesNeeded == 0) {
-                                                                         SetCommandExitStatus(mError);
-                                                                     }
-                                                                 }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -80731,17 +80731,17 @@ class MessagesCancelMessagesRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster cancelMessagesRequestWithParams:params completion:
-                                                                ^(NSError * _Nullable error) {
-                                                                    responsesNeeded--;
-                                                                    if (error != nil) {
-                                                                        mError = error;
-                                                                        LogNSError("Error", error);
-                                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                    }
-                                                                    if (responsesNeeded == 0) {
-                                                                        SetCommandExitStatus(mError);
-                                                                    }
-                                                                }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -81516,17 +81516,17 @@ class DeviceEnergyManagementPowerAdjustRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster powerAdjustRequestWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -81563,17 +81563,17 @@ class DeviceEnergyManagementCancelPowerAdjustRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster cancelPowerAdjustRequestWithParams:params completion:
-                                                                   ^(NSError * _Nullable error) {
-                                                                       responsesNeeded--;
-                                                                       if (error != nil) {
-                                                                           mError = error;
-                                                                           LogNSError("Error", error);
-                                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                       }
-                                                                       if (responsesNeeded == 0) {
-                                                                           SetCommandExitStatus(mError);
-                                                                       }
-                                                                   }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -81621,17 +81621,17 @@ class DeviceEnergyManagementStartTimeAdjustRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster startTimeAdjustRequestWithParams:params completion:
-                                                                 ^(NSError * _Nullable error) {
-                                                                     responsesNeeded--;
-                                                                     if (error != nil) {
-                                                                         mError = error;
-                                                                         LogNSError("Error", error);
-                                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                     }
-                                                                     if (responsesNeeded == 0) {
-                                                                         SetCommandExitStatus(mError);
-                                                                     }
-                                                                 }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -81680,17 +81680,17 @@ class DeviceEnergyManagementPauseRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster pauseRequestWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -81727,17 +81727,17 @@ class DeviceEnergyManagementResumeRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resumeRequestWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -81807,17 +81807,17 @@ class DeviceEnergyManagementModifyForecastRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster modifyForecastRequestWithParams:params completion:
-                                                                ^(NSError * _Nullable error) {
-                                                                    responsesNeeded--;
-                                                                    if (error != nil) {
-                                                                        mError = error;
-                                                                        LogNSError("Error", error);
-                                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                    }
-                                                                    if (responsesNeeded == 0) {
-                                                                        SetCommandExitStatus(mError);
-                                                                    }
-                                                                }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -81893,17 +81893,17 @@ class DeviceEnergyManagementRequestConstraintBasedForecast : public ClusterComma
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster requestConstraintBasedForecastWithParams:params completion:
-                                                                         ^(NSError * _Nullable error) {
-                                                                             responsesNeeded--;
-                                                                             if (error != nil) {
-                                                                                 mError = error;
-                                                                                 LogNSError("Error", error);
-                                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                             }
-                                                                             if (responsesNeeded == 0) {
-                                                                                 SetCommandExitStatus(mError);
-                                                                             }
-                                                                         }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -81941,17 +81941,17 @@ class DeviceEnergyManagementCancelRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster cancelRequestWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -83232,17 +83232,17 @@ class EnergyEvseDisable : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster disableWithParams:params completion:
-                                                  ^(NSError * _Nullable error) {
-                                                      responsesNeeded--;
-                                                      if (error != nil) {
-                                                          mError = error;
-                                                          LogNSError("Error", error);
-                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                      }
-                                                      if (responsesNeeded == 0) {
-                                                          SetCommandExitStatus(mError);
-                                                      }
-                                                  }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -83300,17 +83300,17 @@ class EnergyEvseEnableCharging : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster enableChargingWithParams:params completion:
-                                                         ^(NSError * _Nullable error) {
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -83363,17 +83363,17 @@ class EnergyEvseEnableDischarging : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster enableDischargingWithParams:params completion:
-                                                            ^(NSError * _Nullable error) {
-                                                                responsesNeeded--;
-                                                                if (error != nil) {
-                                                                    mError = error;
-                                                                    LogNSError("Error", error);
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                }
-                                                                if (responsesNeeded == 0) {
-                                                                    SetCommandExitStatus(mError);
-                                                                }
-                                                            }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -83410,17 +83410,17 @@ class EnergyEvseStartDiagnostics : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster startDiagnosticsWithParams:params completion:
-                                                           ^(NSError * _Nullable error) {
-                                                               responsesNeeded--;
-                                                               if (error != nil) {
-                                                                   mError = error;
-                                                                   LogNSError("Error", error);
-                                                                   RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                               }
-                                                               if (responsesNeeded == 0) {
-                                                                   SetCommandExitStatus(mError);
-                                                               }
-                                                           }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -83492,17 +83492,17 @@ class EnergyEvseSetTargets : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setTargetsWithParams:params completion:
-                                                     ^(NSError * _Nullable error) {
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -83540,23 +83540,23 @@ class EnergyEvseGetTargets : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getTargetsWithParams:params completion:
-                                                     ^(MTREnergyEVSEClusterGetTargetsResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                         NSLog(@"Values: %@", values);
-                                                         if (error == nil) {
-                                                             constexpr chip::CommandId responseId = chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::Id;
-                                                             RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                         }
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             constexpr chip::CommandId responseId = chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::Id;
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(MTREnergyEVSEClusterGetTargetsResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::EnergyEvse::Commands::GetTargetsResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -83592,17 +83592,17 @@ class EnergyEvseClearTargets : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster clearTargetsWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -87999,23 +87999,23 @@ class EnergyEvseModeChangeToMode : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTREnergyEVSEModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::EnergyEvseMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::EnergyEvseMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTREnergyEVSEModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::EnergyEvseMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::EnergyEvseMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -89020,23 +89020,23 @@ class WaterHeaterModeChangeToMode : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRWaterHeaterModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::WaterHeaterMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::WaterHeaterMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRWaterHeaterModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::WaterHeaterMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::WaterHeaterMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -90041,23 +90041,23 @@ class DeviceEnergyManagementModeChangeToMode : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeToModeWithParams:params completion:
-                                                       ^(MTRDeviceEnergyManagementModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::DeviceEnergyManagementMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::DeviceEnergyManagementMode::Commands::ChangeToModeResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRDeviceEnergyManagementModeClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DeviceEnergyManagementMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DeviceEnergyManagementMode::Commands::ChangeToModeResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91126,17 +91126,17 @@ class DoorLockLockDoor : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster lockDoorWithParams:params completion:
-                                                   ^(NSError * _Nullable error) {
-                                                       responsesNeeded--;
-                                                       if (error != nil) {
-                                                           mError = error;
-                                                           LogNSError("Error", error);
-                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                       }
-                                                       if (responsesNeeded == 0) {
-                                                           SetCommandExitStatus(mError);
-                                                       }
-                                                   }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91177,17 +91177,17 @@ class DoorLockUnlockDoor : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster unlockDoorWithParams:params completion:
-                                                     ^(NSError * _Nullable error) {
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91230,17 +91230,17 @@ class DoorLockUnlockWithTimeout : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster unlockWithTimeoutWithParams:params completion:
-                                                            ^(NSError * _Nullable error) {
-                                                                responsesNeeded--;
-                                                                if (error != nil) {
-                                                                    mError = error;
-                                                                    LogNSError("Error", error);
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                }
-                                                                if (responsesNeeded == 0) {
-                                                                    SetCommandExitStatus(mError);
-                                                                }
-                                                            }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91289,17 +91289,17 @@ class DoorLockSetWeekDaySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setWeekDayScheduleWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91338,23 +91338,23 @@ class DoorLockGetWeekDaySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getWeekDayScheduleWithParams:params completion:
-                                                             ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                 NSLog(@"Values: %@", values);
-                                                                 if (error == nil) {
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                 }
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91393,17 +91393,17 @@ class DoorLockClearWeekDaySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster clearWeekDayScheduleWithParams:params completion:
-                                                               ^(NSError * _Nullable error) {
-                                                                   responsesNeeded--;
-                                                                   if (error != nil) {
-                                                                       mError = error;
-                                                                       LogNSError("Error", error);
-                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                   }
-                                                                   if (responsesNeeded == 0) {
-                                                                       SetCommandExitStatus(mError);
-                                                                   }
-                                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91446,17 +91446,17 @@ class DoorLockSetYearDaySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setYearDayScheduleWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91495,23 +91495,23 @@ class DoorLockGetYearDaySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getYearDayScheduleWithParams:params completion:
-                                                             ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                 NSLog(@"Values: %@", values);
-                                                                 if (error == nil) {
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                 }
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91550,17 +91550,17 @@ class DoorLockClearYearDaySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster clearYearDayScheduleWithParams:params completion:
-                                                               ^(NSError * _Nullable error) {
-                                                                   responsesNeeded--;
-                                                                   if (error != nil) {
-                                                                       mError = error;
-                                                                       LogNSError("Error", error);
-                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                   }
-                                                                   if (responsesNeeded == 0) {
-                                                                       SetCommandExitStatus(mError);
-                                                                   }
-                                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91603,17 +91603,17 @@ class DoorLockSetHolidaySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setHolidayScheduleWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91650,23 +91650,23 @@ class DoorLockGetHolidaySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getHolidayScheduleWithParams:params completion:
-                                                             ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                 NSLog(@"Values: %@", values);
-                                                                 if (error == nil) {
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                 }
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::Id;
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91703,17 +91703,17 @@ class DoorLockClearHolidaySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster clearHolidayScheduleWithParams:params completion:
-                                                               ^(NSError * _Nullable error) {
-                                                                   responsesNeeded--;
-                                                                   if (error != nil) {
-                                                                       mError = error;
-                                                                       LogNSError("Error", error);
-                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                   }
-                                                                   if (responsesNeeded == 0) {
-                                                                       SetCommandExitStatus(mError);
-                                                                   }
-                                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91782,17 +91782,17 @@ class DoorLockSetUser : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setUserWithParams:params completion:
-                                                  ^(NSError * _Nullable error) {
-                                                      responsesNeeded--;
-                                                      if (error != nil) {
-                                                          mError = error;
-                                                          LogNSError("Error", error);
-                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                      }
-                                                      if (responsesNeeded == 0) {
-                                                          SetCommandExitStatus(mError);
-                                                      }
-                                                  }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91829,23 +91829,23 @@ class DoorLockGetUser : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getUserWithParams:params completion:
-                                                  ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                      NSLog(@"Values: %@", values);
-                                                      if (error == nil) {
-                                                          constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetUserResponse::Id;
-                                                          RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                      }
-                                                      responsesNeeded--;
-                                                      if (error != nil) {
-                                                          mError = error;
-                                                          LogNSError("Error", error);
-                                                          constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetUserResponse::Id;
-                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                      }
-                                                      if (responsesNeeded == 0) {
-                                                          SetCommandExitStatus(mError);
-                                                      }
-                                                  }];
+                    ^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetUserResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetUserResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91882,17 +91882,17 @@ class DoorLockClearUser : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster clearUserWithParams:params completion:
-                                                    ^(NSError * _Nullable error) {
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -91954,23 +91954,23 @@ class DoorLockSetCredential : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setCredentialWithParams:params completion:
-                                                        ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                            NSLog(@"Values: %@", values);
-                                                            if (error == nil) {
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                            }
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(MTRDoorLockClusterSetCredentialResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -92011,23 +92011,23 @@ class DoorLockGetCredentialStatus : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getCredentialStatusWithParams:params completion:
-                                                              ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                  NSLog(@"Values: %@", values);
-                                                                  if (error == nil) {
-                                                                      constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::Id;
-                                                                      RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                  }
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::Id;
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+                    ^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -92072,17 +92072,17 @@ class DoorLockClearCredential : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster clearCredentialWithParams:params completion:
-                                                          ^(NSError * _Nullable error) {
-                                                              responsesNeeded--;
-                                                              if (error != nil) {
-                                                                  mError = error;
-                                                                  LogNSError("Error", error);
-                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                              }
-                                                              if (responsesNeeded == 0) {
-                                                                  SetCommandExitStatus(mError);
-                                                              }
-                                                          }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -92129,17 +92129,17 @@ class DoorLockUnboltDoor : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster unboltDoorWithParams:params completion:
-                                                     ^(NSError * _Nullable error) {
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -92204,17 +92204,17 @@ class DoorLockSetAliroReaderConfig : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setAliroReaderConfigWithParams:params completion:
-                                                               ^(NSError * _Nullable error) {
-                                                                   responsesNeeded--;
-                                                                   if (error != nil) {
-                                                                       mError = error;
-                                                                       LogNSError("Error", error);
-                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                   }
-                                                                   if (responsesNeeded == 0) {
-                                                                       SetCommandExitStatus(mError);
-                                                                   }
-                                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -92251,17 +92251,17 @@ class DoorLockClearAliroReaderConfig : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster clearAliroReaderConfigWithParams:params completion:
-                                                                 ^(NSError * _Nullable error) {
-                                                                     responsesNeeded--;
-                                                                     if (error != nil) {
-                                                                         mError = error;
-                                                                         LogNSError("Error", error);
-                                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                     }
-                                                                     if (responsesNeeded == 0) {
-                                                                         SetCommandExitStatus(mError);
-                                                                     }
-                                                                 }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -97294,17 +97294,17 @@ class WindowCoveringUpOrOpen : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster upOrOpenWithParams:params completion:
-                                                   ^(NSError * _Nullable error) {
-                                                       responsesNeeded--;
-                                                       if (error != nil) {
-                                                           mError = error;
-                                                           LogNSError("Error", error);
-                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                       }
-                                                       if (responsesNeeded == 0) {
-                                                           SetCommandExitStatus(mError);
-                                                       }
-                                                   }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -97338,17 +97338,17 @@ class WindowCoveringDownOrClose : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster downOrCloseWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -97382,17 +97382,17 @@ class WindowCoveringStopMotion : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stopMotionWithParams:params completion:
-                                                     ^(NSError * _Nullable error) {
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -97428,17 +97428,17 @@ class WindowCoveringGoToLiftValue : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster goToLiftValueWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -97475,17 +97475,17 @@ class WindowCoveringGoToLiftPercentage : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster goToLiftPercentageWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -97522,17 +97522,17 @@ class WindowCoveringGoToTiltValue : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster goToTiltValueWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -97569,17 +97569,17 @@ class WindowCoveringGoToTiltPercentage : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster goToTiltPercentageWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -99996,23 +99996,23 @@ class ServiceAreaSelectAreas : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster selectAreasWithParams:params completion:
-                                                      ^(MTRServiceAreaClusterSelectAreasResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                          NSLog(@"Values: %@", values);
-                                                          if (error == nil) {
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::ServiceArea::Commands::SelectAreasResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                          }
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::ServiceArea::Commands::SelectAreasResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(MTRServiceAreaClusterSelectAreasResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ServiceArea::Commands::SelectAreasResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ServiceArea::Commands::SelectAreasResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -100056,23 +100056,23 @@ class ServiceAreaSkipArea : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster skipAreaWithParams:params completion:
-                                                   ^(MTRServiceAreaClusterSkipAreaResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                       NSLog(@"Values: %@", values);
-                                                       if (error == nil) {
-                                                           constexpr chip::CommandId responseId = chip::app::Clusters::ServiceArea::Commands::SkipAreaResponse::Id;
-                                                           RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                       }
-                                                       responsesNeeded--;
-                                                       if (error != nil) {
-                                                           mError = error;
-                                                           LogNSError("Error", error);
-                                                           constexpr chip::CommandId responseId = chip::app::Clusters::ServiceArea::Commands::SkipAreaResponse::Id;
-                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                       }
-                                                       if (responsesNeeded == 0) {
-                                                           SetCommandExitStatus(mError);
-                                                       }
-                                                   }];
+                    ^(MTRServiceAreaClusterSkipAreaResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ServiceArea::Commands::SkipAreaResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ServiceArea::Commands::SkipAreaResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -103825,17 +103825,17 @@ class ThermostatSetpointRaiseLower : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setpointRaiseLowerWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -103898,17 +103898,17 @@ class ThermostatSetWeeklySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setWeeklyScheduleWithParams:params completion:
-                                                            ^(NSError * _Nullable error) {
-                                                                responsesNeeded--;
-                                                                if (error != nil) {
-                                                                    mError = error;
-                                                                    LogNSError("Error", error);
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                }
-                                                                if (responsesNeeded == 0) {
-                                                                    SetCommandExitStatus(mError);
-                                                                }
-                                                            }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -103948,23 +103948,23 @@ class ThermostatGetWeeklySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getWeeklyScheduleWithParams:params completion:
-                                                            ^(MTRThermostatClusterGetWeeklyScheduleResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                NSLog(@"Values: %@", values);
-                                                                if (error == nil) {
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                }
-                                                                responsesNeeded--;
-                                                                if (error != nil) {
-                                                                    mError = error;
-                                                                    LogNSError("Error", error);
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                }
-                                                                if (responsesNeeded == 0) {
-                                                                    SetCommandExitStatus(mError);
-                                                                }
-                                                            }];
+                    ^(MTRThermostatClusterGetWeeklyScheduleResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -103999,17 +103999,17 @@ class ThermostatClearWeeklySchedule : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster clearWeeklyScheduleWithParams:params completion:
-                                                              ^(NSError * _Nullable error) {
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -104050,17 +104050,17 @@ class ThermostatSetActiveScheduleRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setActiveScheduleRequestWithParams:params completion:
-                                                                   ^(NSError * _Nullable error) {
-                                                                       responsesNeeded--;
-                                                                       if (error != nil) {
-                                                                           mError = error;
-                                                                           LogNSError("Error", error);
-                                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                       }
-                                                                       if (responsesNeeded == 0) {
-                                                                           SetCommandExitStatus(mError);
-                                                                       }
-                                                                   }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -104107,17 +104107,17 @@ class ThermostatSetActivePresetRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setActivePresetRequestWithParams:params completion:
-                                                                 ^(NSError * _Nullable error) {
-                                                                     responsesNeeded--;
-                                                                     if (error != nil) {
-                                                                         mError = error;
-                                                                         LogNSError("Error", error);
-                                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                     }
-                                                                     if (responsesNeeded == 0) {
-                                                                         SetCommandExitStatus(mError);
-                                                                     }
-                                                                 }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -104185,23 +104185,23 @@ class ThermostatAtomicRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster atomicRequestWithParams:params completion:
-                                                        ^(MTRThermostatClusterAtomicResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                            NSLog(@"Values: %@", values);
-                                                            if (error == nil) {
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::Thermostat::Commands::AtomicResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                            }
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::Thermostat::Commands::AtomicResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(MTRThermostatClusterAtomicResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Thermostat::Commands::AtomicResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Thermostat::Commands::AtomicResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -111034,17 +111034,17 @@ class FanControlStep : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stepWithParams:params completion:
-                                               ^(NSError * _Nullable error) {
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -113792,17 +113792,17 @@ class ColorControlMoveToHue : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveToHueWithParams:params completion:
-                                                    ^(NSError * _Nullable error) {
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -113845,17 +113845,17 @@ class ColorControlMoveHue : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveHueWithParams:params completion:
-                                                  ^(NSError * _Nullable error) {
-                                                      responsesNeeded--;
-                                                      if (error != nil) {
-                                                          mError = error;
-                                                          LogNSError("Error", error);
-                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                      }
-                                                      if (responsesNeeded == 0) {
-                                                          SetCommandExitStatus(mError);
-                                                      }
-                                                  }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -113900,17 +113900,17 @@ class ColorControlStepHue : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stepHueWithParams:params completion:
-                                                  ^(NSError * _Nullable error) {
-                                                      responsesNeeded--;
-                                                      if (error != nil) {
-                                                          mError = error;
-                                                          LogNSError("Error", error);
-                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                      }
-                                                      if (responsesNeeded == 0) {
-                                                          SetCommandExitStatus(mError);
-                                                      }
-                                                  }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -113953,17 +113953,17 @@ class ColorControlMoveToSaturation : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveToSaturationWithParams:params completion:
-                                                           ^(NSError * _Nullable error) {
-                                                               responsesNeeded--;
-                                                               if (error != nil) {
-                                                                   mError = error;
-                                                                   LogNSError("Error", error);
-                                                                   RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                               }
-                                                               if (responsesNeeded == 0) {
-                                                                   SetCommandExitStatus(mError);
-                                                               }
-                                                           }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114006,17 +114006,17 @@ class ColorControlMoveSaturation : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveSaturationWithParams:params completion:
-                                                         ^(NSError * _Nullable error) {
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114061,17 +114061,17 @@ class ColorControlStepSaturation : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stepSaturationWithParams:params completion:
-                                                         ^(NSError * _Nullable error) {
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114116,17 +114116,17 @@ class ColorControlMoveToHueAndSaturation : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveToHueAndSaturationWithParams:params completion:
-                                                                 ^(NSError * _Nullable error) {
-                                                                     responsesNeeded--;
-                                                                     if (error != nil) {
-                                                                         mError = error;
-                                                                         LogNSError("Error", error);
-                                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                     }
-                                                                     if (responsesNeeded == 0) {
-                                                                         SetCommandExitStatus(mError);
-                                                                     }
-                                                                 }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114171,17 +114171,17 @@ class ColorControlMoveToColor : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveToColorWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114224,17 +114224,17 @@ class ColorControlMoveColor : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveColorWithParams:params completion:
-                                                    ^(NSError * _Nullable error) {
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114279,17 +114279,17 @@ class ColorControlStepColor : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stepColorWithParams:params completion:
-                                                    ^(NSError * _Nullable error) {
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114332,17 +114332,17 @@ class ColorControlMoveToColorTemperature : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveToColorTemperatureWithParams:params completion:
-                                                                 ^(NSError * _Nullable error) {
-                                                                     responsesNeeded--;
-                                                                     if (error != nil) {
-                                                                         mError = error;
-                                                                         LogNSError("Error", error);
-                                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                     }
-                                                                     if (responsesNeeded == 0) {
-                                                                         SetCommandExitStatus(mError);
-                                                                     }
-                                                                 }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114387,17 +114387,17 @@ class ColorControlEnhancedMoveToHue : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster enhancedMoveToHueWithParams:params completion:
-                                                            ^(NSError * _Nullable error) {
-                                                                responsesNeeded--;
-                                                                if (error != nil) {
-                                                                    mError = error;
-                                                                    LogNSError("Error", error);
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                }
-                                                                if (responsesNeeded == 0) {
-                                                                    SetCommandExitStatus(mError);
-                                                                }
-                                                            }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114440,17 +114440,17 @@ class ColorControlEnhancedMoveHue : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster enhancedMoveHueWithParams:params completion:
-                                                          ^(NSError * _Nullable error) {
-                                                              responsesNeeded--;
-                                                              if (error != nil) {
-                                                                  mError = error;
-                                                                  LogNSError("Error", error);
-                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                              }
-                                                              if (responsesNeeded == 0) {
-                                                                  SetCommandExitStatus(mError);
-                                                              }
-                                                          }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114495,17 +114495,17 @@ class ColorControlEnhancedStepHue : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster enhancedStepHueWithParams:params completion:
-                                                          ^(NSError * _Nullable error) {
-                                                              responsesNeeded--;
-                                                              if (error != nil) {
-                                                                  mError = error;
-                                                                  LogNSError("Error", error);
-                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                              }
-                                                              if (responsesNeeded == 0) {
-                                                                  SetCommandExitStatus(mError);
-                                                              }
-                                                          }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114550,17 +114550,17 @@ class ColorControlEnhancedMoveToHueAndSaturation : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster enhancedMoveToHueAndSaturationWithParams:params completion:
-                                                                         ^(NSError * _Nullable error) {
-                                                                             responsesNeeded--;
-                                                                             if (error != nil) {
-                                                                                 mError = error;
-                                                                                 LogNSError("Error", error);
-                                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                             }
-                                                                             if (responsesNeeded == 0) {
-                                                                                 SetCommandExitStatus(mError);
-                                                                             }
-                                                                         }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114609,17 +114609,17 @@ class ColorControlColorLoopSet : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster colorLoopSetWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114658,17 +114658,17 @@ class ColorControlStopMoveStep : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stopMoveStepWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114715,17 +114715,17 @@ class ColorControlMoveColorTemperature : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster moveColorTemperatureWithParams:params completion:
-                                                               ^(NSError * _Nullable error) {
-                                                                   responsesNeeded--;
-                                                                   if (error != nil) {
-                                                                       mError = error;
-                                                                       LogNSError("Error", error);
-                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                   }
-                                                                   if (responsesNeeded == 0) {
-                                                                       SetCommandExitStatus(mError);
-                                                                   }
-                                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -114774,17 +114774,17 @@ class ColorControlStepColorTemperature : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stepColorTemperatureWithParams:params completion:
-                                                               ^(NSError * _Nullable error) {
-                                                                   responsesNeeded--;
-                                                                   if (error != nil) {
-                                                                       mError = error;
-                                                                       LogNSError("Error", error);
-                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                   }
-                                                                   if (responsesNeeded == 0) {
-                                                                       SetCommandExitStatus(mError);
-                                                                   }
-                                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -143304,23 +143304,23 @@ class WiFiNetworkManagementNetworkPassphraseRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster networkPassphraseRequestWithParams:params completion:
-                                                                   ^(MTRWiFiNetworkManagementClusterNetworkPassphraseResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                       NSLog(@"Values: %@", values);
-                                                                       if (error == nil) {
-                                                                           constexpr chip::CommandId responseId = chip::app::Clusters::WiFiNetworkManagement::Commands::NetworkPassphraseResponse::Id;
-                                                                           RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                       }
-                                                                       responsesNeeded--;
-                                                                       if (error != nil) {
-                                                                           mError = error;
-                                                                           LogNSError("Error", error);
-                                                                           constexpr chip::CommandId responseId = chip::app::Clusters::WiFiNetworkManagement::Commands::NetworkPassphraseResponse::Id;
-                                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                       }
-                                                                       if (responsesNeeded == 0) {
-                                                                           SetCommandExitStatus(mError);
-                                                                       }
-                                                                   }];
+                    ^(MTRWiFiNetworkManagementClusterNetworkPassphraseResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::WiFiNetworkManagement::Commands::NetworkPassphraseResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::WiFiNetworkManagement::Commands::NetworkPassphraseResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -144065,23 +144065,23 @@ class ThreadBorderRouterManagementGetActiveDatasetRequest : public ClusterComman
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getActiveDatasetRequestWithParams:params completion:
-                                                                  ^(MTRThreadBorderRouterManagementClusterDatasetResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                      NSLog(@"Values: %@", values);
-                                                                      if (error == nil) {
-                                                                          constexpr chip::CommandId responseId = chip::app::Clusters::ThreadBorderRouterManagement::Commands::DatasetResponse::Id;
-                                                                          RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                      }
-                                                                      responsesNeeded--;
-                                                                      if (error != nil) {
-                                                                          mError = error;
-                                                                          LogNSError("Error", error);
-                                                                          constexpr chip::CommandId responseId = chip::app::Clusters::ThreadBorderRouterManagement::Commands::DatasetResponse::Id;
-                                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                      }
-                                                                      if (responsesNeeded == 0) {
-                                                                          SetCommandExitStatus(mError);
-                                                                      }
-                                                                  }];
+                    ^(MTRThreadBorderRouterManagementClusterDatasetResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ThreadBorderRouterManagement::Commands::DatasetResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ThreadBorderRouterManagement::Commands::DatasetResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -144117,23 +144117,23 @@ class ThreadBorderRouterManagementGetPendingDatasetRequest : public ClusterComma
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getPendingDatasetRequestWithParams:params completion:
-                                                                   ^(MTRThreadBorderRouterManagementClusterDatasetResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                       NSLog(@"Values: %@", values);
-                                                                       if (error == nil) {
-                                                                           constexpr chip::CommandId responseId = chip::app::Clusters::ThreadBorderRouterManagement::Commands::DatasetResponse::Id;
-                                                                           RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                       }
-                                                                       responsesNeeded--;
-                                                                       if (error != nil) {
-                                                                           mError = error;
-                                                                           LogNSError("Error", error);
-                                                                           constexpr chip::CommandId responseId = chip::app::Clusters::ThreadBorderRouterManagement::Commands::DatasetResponse::Id;
-                                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                       }
-                                                                       if (responsesNeeded == 0) {
-                                                                           SetCommandExitStatus(mError);
-                                                                       }
-                                                                   }];
+                    ^(MTRThreadBorderRouterManagementClusterDatasetResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ThreadBorderRouterManagement::Commands::DatasetResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ThreadBorderRouterManagement::Commands::DatasetResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -144185,17 +144185,17 @@ class ThreadBorderRouterManagementSetActiveDatasetRequest : public ClusterComman
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setActiveDatasetRequestWithParams:params completion:
-                                                                  ^(NSError * _Nullable error) {
-                                                                      responsesNeeded--;
-                                                                      if (error != nil) {
-                                                                          mError = error;
-                                                                          LogNSError("Error", error);
-                                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                      }
-                                                                      if (responsesNeeded == 0) {
-                                                                          SetCommandExitStatus(mError);
-                                                                      }
-                                                                  }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -144238,17 +144238,17 @@ class ThreadBorderRouterManagementSetPendingDatasetRequest : public ClusterComma
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setPendingDatasetRequestWithParams:params completion:
-                                                                   ^(NSError * _Nullable error) {
-                                                                       responsesNeeded--;
-                                                                       if (error != nil) {
-                                                                           mError = error;
-                                                                           LogNSError("Error", error);
-                                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                       }
-                                                                       if (responsesNeeded == 0) {
-                                                                           SetCommandExitStatus(mError);
-                                                                       }
-                                                                   }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -145336,17 +145336,17 @@ class ThreadNetworkDirectoryAddNetwork : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addNetworkWithParams:params completion:
-                                                     ^(NSError * _Nullable error) {
-                                                         responsesNeeded--;
-                                                         if (error != nil) {
-                                                             mError = error;
-                                                             LogNSError("Error", error);
-                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                         }
-                                                         if (responsesNeeded == 0) {
-                                                             SetCommandExitStatus(mError);
-                                                         }
-                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -145389,17 +145389,17 @@ class ThreadNetworkDirectoryRemoveNetwork : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster removeNetworkWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -145442,23 +145442,23 @@ class ThreadNetworkDirectoryGetOperationalDataset : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getOperationalDatasetWithParams:params completion:
-                                                                ^(MTRThreadNetworkDirectoryClusterOperationalDatasetResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                    NSLog(@"Values: %@", values);
-                                                                    if (error == nil) {
-                                                                        constexpr chip::CommandId responseId = chip::app::Clusters::ThreadNetworkDirectory::Commands::OperationalDatasetResponse::Id;
-                                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                    }
-                                                                    responsesNeeded--;
-                                                                    if (error != nil) {
-                                                                        mError = error;
-                                                                        LogNSError("Error", error);
-                                                                        constexpr chip::CommandId responseId = chip::app::Clusters::ThreadNetworkDirectory::Commands::OperationalDatasetResponse::Id;
-                                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                    }
-                                                                    if (responsesNeeded == 0) {
-                                                                        SetCommandExitStatus(mError);
-                                                                    }
-                                                                }];
+                    ^(MTRThreadNetworkDirectoryClusterOperationalDatasetResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ThreadNetworkDirectory::Commands::OperationalDatasetResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ThreadNetworkDirectory::Commands::OperationalDatasetResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -147014,23 +147014,23 @@ class ChannelChangeChannel : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeChannelWithParams:params completion:
-                                                        ^(MTRChannelClusterChangeChannelResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                            NSLog(@"Values: %@", values);
-                                                            if (error == nil) {
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::Channel::Commands::ChangeChannelResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                            }
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::Channel::Commands::ChangeChannelResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(MTRChannelClusterChangeChannelResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Channel::Commands::ChangeChannelResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Channel::Commands::ChangeChannelResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -147069,17 +147069,17 @@ class ChannelChangeChannelByNumber : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster changeChannelByNumberWithParams:params completion:
-                                                                ^(NSError * _Nullable error) {
-                                                                    responsesNeeded--;
-                                                                    if (error != nil) {
-                                                                        mError = error;
-                                                                        LogNSError("Error", error);
-                                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                    }
-                                                                    if (responsesNeeded == 0) {
-                                                                        SetCommandExitStatus(mError);
-                                                                    }
-                                                                }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -147116,17 +147116,17 @@ class ChannelSkipChannel : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster skipChannelWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -147295,23 +147295,23 @@ class ChannelGetProgramGuide : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getProgramGuideWithParams:params completion:
-                                                          ^(MTRChannelClusterProgramGuideResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                              NSLog(@"Values: %@", values);
-                                                              if (error == nil) {
-                                                                  constexpr chip::CommandId responseId = chip::app::Clusters::Channel::Commands::ProgramGuideResponse::Id;
-                                                                  RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                              }
-                                                              responsesNeeded--;
-                                                              if (error != nil) {
-                                                                  mError = error;
-                                                                  LogNSError("Error", error);
-                                                                  constexpr chip::CommandId responseId = chip::app::Clusters::Channel::Commands::ProgramGuideResponse::Id;
-                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                              }
-                                                              if (responsesNeeded == 0) {
-                                                                  SetCommandExitStatus(mError);
-                                                              }
-                                                          }];
+                    ^(MTRChannelClusterProgramGuideResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Channel::Commands::ProgramGuideResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::Channel::Commands::ProgramGuideResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -147386,17 +147386,17 @@ class ChannelRecordProgram : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster recordProgramWithParams:params completion:
-                                                        ^(NSError * _Nullable error) {
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -147469,17 +147469,17 @@ class ChannelCancelRecordProgram : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster cancelRecordProgramWithParams:params completion:
-                                                              ^(NSError * _Nullable error) {
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -148287,23 +148287,23 @@ class TargetNavigatorNavigateTarget : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster navigateTargetWithParams:params completion:
-                                                         ^(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                             NSLog(@"Values: %@", values);
-                                                             if (error == nil) {
-                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Id;
-                                                                 RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                             }
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Id;
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(MTRTargetNavigatorClusterNavigateTargetResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149040,23 +149040,23 @@ class MediaPlaybackPlay : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster playWithParams:params completion:
-                                               ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                   NSLog(@"Values: %@", values);
-                                                   if (error == nil) {
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                   }
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149090,23 +149090,23 @@ class MediaPlaybackPause : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster pauseWithParams:params completion:
-                                                ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                    NSLog(@"Values: %@", values);
-                                                    if (error == nil) {
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                    }
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149140,23 +149140,23 @@ class MediaPlaybackStop : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stopWithParams:params completion:
-                                               ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                   NSLog(@"Values: %@", values);
-                                                   if (error == nil) {
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                   }
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149190,23 +149190,23 @@ class MediaPlaybackStartOver : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster startOverWithParams:params completion:
-                                                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                        NSLog(@"Values: %@", values);
-                                                        if (error == nil) {
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                        }
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149240,23 +149240,23 @@ class MediaPlaybackPrevious : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster previousWithParams:params completion:
-                                                   ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                       NSLog(@"Values: %@", values);
-                                                       if (error == nil) {
-                                                           constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                           RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                       }
-                                                       responsesNeeded--;
-                                                       if (error != nil) {
-                                                           mError = error;
-                                                           LogNSError("Error", error);
-                                                           constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                       }
-                                                       if (responsesNeeded == 0) {
-                                                           SetCommandExitStatus(mError);
-                                                       }
-                                                   }];
+                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149290,23 +149290,23 @@ class MediaPlaybackNext : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster nextWithParams:params completion:
-                                               ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                   NSLog(@"Values: %@", values);
-                                                   if (error == nil) {
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                   }
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149350,23 +149350,23 @@ class MediaPlaybackRewind : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster rewindWithParams:params completion:
-                                                 ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                     NSLog(@"Values: %@", values);
-                                                     if (error == nil) {
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                     }
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                         constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
+                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149411,23 +149411,23 @@ class MediaPlaybackFastForward : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster fastForwardWithParams:params completion:
-                                                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                          NSLog(@"Values: %@", values);
-                                                          if (error == nil) {
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                          }
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149464,23 +149464,23 @@ class MediaPlaybackSkipForward : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster skipForwardWithParams:params completion:
-                                                      ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                          NSLog(@"Values: %@", values);
-                                                          if (error == nil) {
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                          }
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149517,23 +149517,23 @@ class MediaPlaybackSkipBackward : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster skipBackwardWithParams:params completion:
-                                                       ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149570,23 +149570,23 @@ class MediaPlaybackSeek : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster seekWithParams:params completion:
-                                               ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                   NSLog(@"Values: %@", values);
-                                                   if (error == nil) {
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                   }
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(MTRMediaPlaybackClusterPlaybackResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149634,17 +149634,17 @@ class MediaPlaybackActivateAudioTrack : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster activateAudioTrackWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149687,17 +149687,17 @@ class MediaPlaybackActivateTextTrack : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster activateTextTrackWithParams:params completion:
-                                                            ^(NSError * _Nullable error) {
-                                                                responsesNeeded--;
-                                                                if (error != nil) {
-                                                                    mError = error;
-                                                                    LogNSError("Error", error);
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                }
-                                                                if (responsesNeeded == 0) {
-                                                                    SetCommandExitStatus(mError);
-                                                                }
-                                                            }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -149734,17 +149734,17 @@ class MediaPlaybackDeactivateTextTrack : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster deactivateTextTrackWithParams:params completion:
-                                                              ^(NSError * _Nullable error) {
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -151215,17 +151215,17 @@ class MediaInputSelectInput : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster selectInputWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -151260,17 +151260,17 @@ class MediaInputShowInputStatus : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster showInputStatusWithParams:params completion:
-                                                          ^(NSError * _Nullable error) {
-                                                              responsesNeeded--;
-                                                              if (error != nil) {
-                                                                  mError = error;
-                                                                  LogNSError("Error", error);
-                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                              }
-                                                              if (responsesNeeded == 0) {
-                                                                  SetCommandExitStatus(mError);
-                                                              }
-                                                          }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -151304,17 +151304,17 @@ class MediaInputHideInputStatus : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster hideInputStatusWithParams:params completion:
-                                                          ^(NSError * _Nullable error) {
-                                                              responsesNeeded--;
-                                                              if (error != nil) {
-                                                                  mError = error;
-                                                                  LogNSError("Error", error);
-                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                              }
-                                                              if (responsesNeeded == 0) {
-                                                                  SetCommandExitStatus(mError);
-                                                              }
-                                                          }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -151352,17 +151352,17 @@ class MediaInputRenameInput : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster renameInputWithParams:params completion:
-                                                      ^(NSError * _Nullable error) {
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -152074,17 +152074,17 @@ class LowPowerSleep : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster sleepWithParams:params completion:
-                                                ^(NSError * _Nullable error) {
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -152633,23 +152633,23 @@ class KeypadInputSendKey : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster sendKeyWithParams:params completion:
-                                                  ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                      NSLog(@"Values: %@", values);
-                                                      if (error == nil) {
-                                                          constexpr chip::CommandId responseId = chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::Id;
-                                                          RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                      }
-                                                      responsesNeeded--;
-                                                      if (error != nil) {
-                                                          mError = error;
-                                                          LogNSError("Error", error);
-                                                          constexpr chip::CommandId responseId = chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::Id;
-                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                      }
-                                                      if (responsesNeeded == 0) {
-                                                          SetCommandExitStatus(mError);
-                                                      }
-                                                  }];
+                    ^(MTRKeypadInputClusterSendKeyResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -153303,23 +153303,23 @@ class ContentLauncherLaunchContent : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster launchContentWithParams:params completion:
-                                                        ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                            NSLog(@"Values: %@", values);
-                                                            if (error == nil) {
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                            }
-                                                            responsesNeeded--;
-                                                            if (error != nil) {
-                                                                mError = error;
-                                                                LogNSError("Error", error);
-                                                                constexpr chip::CommandId responseId = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Id;
-                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                            }
-                                                            if (responsesNeeded == 0) {
-                                                                SetCommandExitStatus(mError);
-                                                            }
-                                                        }];
+                    ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -153487,23 +153487,23 @@ class ContentLauncherLaunchURL : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster launchURLWithParams:params completion:
-                                                    ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                        NSLog(@"Values: %@", values);
-                                                        if (error == nil) {
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                        }
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(MTRContentLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ContentLauncher::Commands::LauncherResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -154221,17 +154221,17 @@ class AudioOutputSelectOutput : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster selectOutputWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -154270,17 +154270,17 @@ class AudioOutputRenameOutput : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster renameOutputWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -155011,23 +155011,23 @@ class ApplicationLauncherLaunchApp : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster launchAppWithParams:params completion:
-                                                    ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                        NSLog(@"Values: %@", values);
-                                                        if (error == nil) {
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                        }
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -155072,23 +155072,23 @@ class ApplicationLauncherStopApp : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stopAppWithParams:params completion:
-                                                  ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                      NSLog(@"Values: %@", values);
-                                                      if (error == nil) {
-                                                          constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
-                                                          RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                      }
-                                                      responsesNeeded--;
-                                                      if (error != nil) {
-                                                          mError = error;
-                                                          LogNSError("Error", error);
-                                                          constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
-                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                      }
-                                                      if (responsesNeeded == 0) {
-                                                          SetCommandExitStatus(mError);
-                                                      }
-                                                  }];
+                    ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -155133,23 +155133,23 @@ class ApplicationLauncherHideApp : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster hideAppWithParams:params completion:
-                                                  ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                      NSLog(@"Values: %@", values);
-                                                      if (error == nil) {
-                                                          constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
-                                                          RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                      }
-                                                      responsesNeeded--;
-                                                      if (error != nil) {
-                                                          mError = error;
-                                                          LogNSError("Error", error);
-                                                          constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
-                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                      }
-                                                      if (responsesNeeded == 0) {
-                                                          SetCommandExitStatus(mError);
-                                                      }
-                                                  }];
+                    ^(MTRApplicationLauncherClusterLauncherResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -157043,23 +157043,23 @@ class AccountLoginGetSetupPIN : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster getSetupPINWithParams:params completion:
-                                                      ^(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                          NSLog(@"Values: %@", values);
-                                                          if (error == nil) {
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                          }
-                                                          responsesNeeded--;
-                                                          if (error != nil) {
-                                                              mError = error;
-                                                              LogNSError("Error", error);
-                                                              constexpr chip::CommandId responseId = chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::Id;
-                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                          }
-                                                          if (responsesNeeded == 0) {
-                                                              SetCommandExitStatus(mError);
-                                                          }
-                                                      }];
+                    ^(MTRAccountLoginClusterGetSetupPINResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -157108,17 +157108,17 @@ class AccountLoginLogin : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster loginWithParams:params completion:
-                                                ^(NSError * _Nullable error) {
-                                                    responsesNeeded--;
-                                                    if (error != nil) {
-                                                        mError = error;
-                                                        LogNSError("Error", error);
-                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                    }
-                                                    if (responsesNeeded == 0) {
-                                                        SetCommandExitStatus(mError);
-                                                    }
-                                                }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -157163,17 +157163,17 @@ class AccountLoginLogout : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster logoutWithParams:params completion:
-                                                 ^(NSError * _Nullable error) {
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -157757,17 +157757,17 @@ class ContentControlUpdatePIN : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster updatePINWithParams:params completion:
-                                                    ^(NSError * _Nullable error) {
-                                                        responsesNeeded--;
-                                                        if (error != nil) {
-                                                            mError = error;
-                                                            LogNSError("Error", error);
-                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                        }
-                                                        if (responsesNeeded == 0) {
-                                                            SetCommandExitStatus(mError);
-                                                        }
-                                                    }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -157804,23 +157804,23 @@ class ContentControlResetPIN : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster resetPINWithParams:params completion:
-                                                   ^(MTRContentControlClusterResetPINResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                       NSLog(@"Values: %@", values);
-                                                       if (error == nil) {
-                                                           constexpr chip::CommandId responseId = chip::app::Clusters::ContentControl::Commands::ResetPINResponse::Id;
-                                                           RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                       }
-                                                       responsesNeeded--;
-                                                       if (error != nil) {
-                                                           mError = error;
-                                                           LogNSError("Error", error);
-                                                           constexpr chip::CommandId responseId = chip::app::Clusters::ContentControl::Commands::ResetPINResponse::Id;
-                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                       }
-                                                       if (responsesNeeded == 0) {
-                                                           SetCommandExitStatus(mError);
-                                                       }
-                                                   }];
+                    ^(MTRContentControlClusterResetPINResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ContentControl::Commands::ResetPINResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ContentControl::Commands::ResetPINResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -157856,17 +157856,17 @@ class ContentControlEnable : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster enableWithParams:params completion:
-                                                 ^(NSError * _Nullable error) {
-                                                     responsesNeeded--;
-                                                     if (error != nil) {
-                                                         mError = error;
-                                                         LogNSError("Error", error);
-                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                     }
-                                                     if (responsesNeeded == 0) {
-                                                         SetCommandExitStatus(mError);
-                                                     }
-                                                 }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -157902,17 +157902,17 @@ class ContentControlDisable : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster disableWithParams:params completion:
-                                                  ^(NSError * _Nullable error) {
-                                                      responsesNeeded--;
-                                                      if (error != nil) {
-                                                          mError = error;
-                                                          LogNSError("Error", error);
-                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                      }
-                                                      if (responsesNeeded == 0) {
-                                                          SetCommandExitStatus(mError);
-                                                      }
-                                                  }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -157968,17 +157968,17 @@ class ContentControlAddBonusTime : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addBonusTimeWithParams:params completion:
-                                                       ^(NSError * _Nullable error) {
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -158021,17 +158021,17 @@ class ContentControlSetScreenDailyTime : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setScreenDailyTimeWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -158068,17 +158068,17 @@ class ContentControlBlockUnratedContent : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster blockUnratedContentWithParams:params completion:
-                                                              ^(NSError * _Nullable error) {
-                                                                  responsesNeeded--;
-                                                                  if (error != nil) {
-                                                                      mError = error;
-                                                                      LogNSError("Error", error);
-                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                  }
-                                                                  if (responsesNeeded == 0) {
-                                                                      SetCommandExitStatus(mError);
-                                                                  }
-                                                              }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -158114,17 +158114,17 @@ class ContentControlUnblockUnratedContent : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster unblockUnratedContentWithParams:params completion:
-                                                                ^(NSError * _Nullable error) {
-                                                                    responsesNeeded--;
-                                                                    if (error != nil) {
-                                                                        mError = error;
-                                                                        LogNSError("Error", error);
-                                                                        RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                    }
-                                                                    if (responsesNeeded == 0) {
-                                                                        SetCommandExitStatus(mError);
-                                                                    }
-                                                                }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -158166,17 +158166,17 @@ class ContentControlSetOnDemandRatingThreshold : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setOnDemandRatingThresholdWithParams:params completion:
-                                                                     ^(NSError * _Nullable error) {
-                                                                         responsesNeeded--;
-                                                                         if (error != nil) {
-                                                                             mError = error;
-                                                                             LogNSError("Error", error);
-                                                                             RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                         }
-                                                                         if (responsesNeeded == 0) {
-                                                                             SetCommandExitStatus(mError);
-                                                                         }
-                                                                     }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -158219,17 +158219,17 @@ class ContentControlSetScheduledContentRatingThreshold : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster setScheduledContentRatingThresholdWithParams:params completion:
-                                                                             ^(NSError * _Nullable error) {
-                                                                                 responsesNeeded--;
-                                                                                 if (error != nil) {
-                                                                                     mError = error;
-                                                                                     LogNSError("Error", error);
-                                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                                 }
-                                                                                 if (responsesNeeded == 0) {
-                                                                                     SetCommandExitStatus(mError);
-                                                                                 }
-                                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -159492,23 +159492,23 @@ class ContentAppObserverContentAppMessage : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster contentAppMessageWithParams:params completion:
-                                                            ^(MTRContentAppObserverClusterContentAppMessageResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                NSLog(@"Values: %@", values);
-                                                                if (error == nil) {
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                }
-                                                                responsesNeeded--;
-                                                                if (error != nil) {
-                                                                    mError = error;
-                                                                    LogNSError("Error", error);
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                }
-                                                                if (responsesNeeded == 0) {
-                                                                    SetCommandExitStatus(mError);
-                                                                }
-                                                            }];
+                    ^(MTRContentAppObserverClusterContentAppMessageResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -160814,17 +160814,17 @@ class CommissionerControlRequestCommissioningApproval : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster requestCommissioningApprovalWithParams:params completion:
-                                                                       ^(NSError * _Nullable error) {
-                                                                           responsesNeeded--;
-                                                                           if (error != nil) {
-                                                                               mError = error;
-                                                                               LogNSError("Error", error);
-                                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                           }
-                                                                           if (responsesNeeded == 0) {
-                                                                               SetCommandExitStatus(mError);
-                                                                           }
-                                                                       }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -160873,23 +160873,23 @@ class CommissionerControlCommissionNode : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster commissionNodeWithParams:params completion:
-                                                         ^(MTRCommissionerControlClusterReverseOpenCommissioningWindowParams * _Nullable values, NSError * _Nullable error) {
-                                                             NSLog(@"Values: %@", values);
-                                                             if (error == nil) {
-                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::CommissionerControl::Commands::ReverseOpenCommissioningWindow::Id;
-                                                                 RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                             }
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::CommissionerControl::Commands::ReverseOpenCommissioningWindow::Id;
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(MTRCommissionerControlClusterReverseOpenCommissioningWindowParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::CommissionerControl::Commands::ReverseOpenCommissioningWindow::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::CommissionerControl::Commands::ReverseOpenCommissioningWindow::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -161657,17 +161657,17 @@ class UnitTestingTest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testWithParams:params completion:
-                                               ^(NSError * _Nullable error) {
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -161701,17 +161701,17 @@ class UnitTestingTestNotHandled : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testNotHandledWithParams:params completion:
-                                                         ^(NSError * _Nullable error) {
-                                                             responsesNeeded--;
-                                                             if (error != nil) {
-                                                                 mError = error;
-                                                                 LogNSError("Error", error);
-                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                             }
-                                                             if (responsesNeeded == 0) {
-                                                                 SetCommandExitStatus(mError);
-                                                             }
-                                                         }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -161745,23 +161745,23 @@ class UnitTestingTestSpecific : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testSpecificWithParams:params completion:
-                                                       ^(MTRUnitTestingClusterTestSpecificResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestSpecificResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestSpecificResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRUnitTestingClusterTestSpecificResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestSpecificResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestSpecificResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -161795,17 +161795,17 @@ class UnitTestingTestUnknownCommand : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testUnknownCommandWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -161843,23 +161843,23 @@ class UnitTestingTestAddArguments : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testAddArgumentsWithParams:params completion:
-                                                           ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                               NSLog(@"Values: %@", values);
-                                                               if (error == nil) {
-                                                                   constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestAddArgumentsResponse::Id;
-                                                                   RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                               }
-                                                               responsesNeeded--;
-                                                               if (error != nil) {
-                                                                   mError = error;
-                                                                   LogNSError("Error", error);
-                                                                   constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestAddArgumentsResponse::Id;
-                                                                   RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                               }
-                                                               if (responsesNeeded == 0) {
-                                                                   SetCommandExitStatus(mError);
-                                                               }
-                                                           }];
+                    ^(MTRUnitTestingClusterTestAddArgumentsResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestAddArgumentsResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestAddArgumentsResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -161896,23 +161896,23 @@ class UnitTestingTestSimpleArgumentRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testSimpleArgumentRequestWithParams:params completion:
-                                                                    ^(MTRUnitTestingClusterTestSimpleArgumentResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                        NSLog(@"Values: %@", values);
-                                                                        if (error == nil) {
-                                                                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentResponse::Id;
-                                                                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                        }
-                                                                        responsesNeeded--;
-                                                                        if (error != nil) {
-                                                                            mError = error;
-                                                                            LogNSError("Error", error);
-                                                                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentResponse::Id;
-                                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                        }
-                                                                        if (responsesNeeded == 0) {
-                                                                            SetCommandExitStatus(mError);
-                                                                        }
-                                                                    }];
+                    ^(MTRUnitTestingClusterTestSimpleArgumentResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestSimpleArgumentResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -162073,23 +162073,23 @@ class UnitTestingTestStructArrayArgumentRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testStructArrayArgumentRequestWithParams:params completion:
-                                                                         ^(MTRUnitTestingClusterTestStructArrayArgumentResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                             NSLog(@"Values: %@", values);
-                                                                             if (error == nil) {
-                                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestStructArrayArgumentResponse::Id;
-                                                                                 RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                             }
-                                                                             responsesNeeded--;
-                                                                             if (error != nil) {
-                                                                                 mError = error;
-                                                                                 LogNSError("Error", error);
-                                                                                 constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestStructArrayArgumentResponse::Id;
-                                                                                 RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                             }
-                                                                             if (responsesNeeded == 0) {
-                                                                                 SetCommandExitStatus(mError);
-                                                                             }
-                                                                         }];
+                    ^(MTRUnitTestingClusterTestStructArrayArgumentResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestStructArrayArgumentResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestStructArrayArgumentResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -162144,23 +162144,23 @@ class UnitTestingTestStructArgumentRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testStructArgumentRequestWithParams:params completion:
-                                                                    ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                        NSLog(@"Values: %@", values);
-                                                                        if (error == nil) {
-                                                                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                        }
-                                                                        responsesNeeded--;
-                                                                        if (error != nil) {
-                                                                            mError = error;
-                                                                            LogNSError("Error", error);
-                                                                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                        }
-                                                                        if (responsesNeeded == 0) {
-                                                                            SetCommandExitStatus(mError);
-                                                                        }
-                                                                    }];
+                    ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -162235,23 +162235,23 @@ class UnitTestingTestNestedStructArgumentRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testNestedStructArgumentRequestWithParams:params completion:
-                                                                          ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                              NSLog(@"Values: %@", values);
-                                                                              if (error == nil) {
-                                                                                  constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                                  RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                              }
-                                                                              responsesNeeded--;
-                                                                              if (error != nil) {
-                                                                                  mError = error;
-                                                                                  LogNSError("Error", error);
-                                                                                  constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                                  RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                              }
-                                                                              if (responsesNeeded == 0) {
-                                                                                  SetCommandExitStatus(mError);
-                                                                              }
-                                                                          }];
+                    ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -162311,23 +162311,23 @@ class UnitTestingTestListStructArgumentRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testListStructArgumentRequestWithParams:params completion:
-                                                                        ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                            NSLog(@"Values: %@", values);
-                                                                            if (error == nil) {
-                                                                                constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                            }
-                                                                            responsesNeeded--;
-                                                                            if (error != nil) {
-                                                                                mError = error;
-                                                                                LogNSError("Error", error);
-                                                                                constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                            }
-                                                                            if (responsesNeeded == 0) {
-                                                                                SetCommandExitStatus(mError);
-                                                                            }
-                                                                        }];
+                    ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -162374,23 +162374,23 @@ class UnitTestingTestListInt8UArgumentRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testListInt8UArgumentRequestWithParams:params completion:
-                                                                       ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                           NSLog(@"Values: %@", values);
-                                                                           if (error == nil) {
-                                                                               constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                           }
-                                                                           responsesNeeded--;
-                                                                           if (error != nil) {
-                                                                               mError = error;
-                                                                               LogNSError("Error", error);
-                                                                               constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                           }
-                                                                           if (responsesNeeded == 0) {
-                                                                               SetCommandExitStatus(mError);
-                                                                           }
-                                                                       }];
+                    ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -162494,23 +162494,23 @@ class UnitTestingTestNestedStructListArgumentRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testNestedStructListArgumentRequestWithParams:params completion:
-                                                                              ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                                  NSLog(@"Values: %@", values);
-                                                                                  if (error == nil) {
-                                                                                      constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                                      RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                                  }
-                                                                                  responsesNeeded--;
-                                                                                  if (error != nil) {
-                                                                                      mError = error;
-                                                                                      LogNSError("Error", error);
-                                                                                      constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                                      RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                                  }
-                                                                                  if (responsesNeeded == 0) {
-                                                                                      SetCommandExitStatus(mError);
-                                                                                  }
-                                                                              }];
+                    ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -162622,23 +162622,23 @@ class UnitTestingTestListNestedStructListArgumentRequest : public ClusterCommand
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testListNestedStructListArgumentRequestWithParams:params completion:
-                                                                                  ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                                      NSLog(@"Values: %@", values);
-                                                                                      if (error == nil) {
-                                                                                          constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                                          RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                                      }
-                                                                                      responsesNeeded--;
-                                                                                      if (error != nil) {
-                                                                                          mError = error;
-                                                                                          LogNSError("Error", error);
-                                                                                          constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
-                                                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                                      }
-                                                                                      if (responsesNeeded == 0) {
-                                                                                          SetCommandExitStatus(mError);
-                                                                                      }
-                                                                                  }];
+                    ^(MTRUnitTestingClusterBooleanResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::BooleanResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -162685,23 +162685,23 @@ class UnitTestingTestListInt8UReverseRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testListInt8UReverseRequestWithParams:params completion:
-                                                                      ^(MTRUnitTestingClusterTestListInt8UReverseResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                          NSLog(@"Values: %@", values);
-                                                                          if (error == nil) {
-                                                                              constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseResponse::Id;
-                                                                              RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                          }
-                                                                          responsesNeeded--;
-                                                                          if (error != nil) {
-                                                                              mError = error;
-                                                                              LogNSError("Error", error);
-                                                                              constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseResponse::Id;
-                                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                          }
-                                                                          if (responsesNeeded == 0) {
-                                                                              SetCommandExitStatus(mError);
-                                                                          }
-                                                                      }];
+                    ^(MTRUnitTestingClusterTestListInt8UReverseResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestListInt8UReverseResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -162741,23 +162741,23 @@ class UnitTestingTestEnumsRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testEnumsRequestWithParams:params completion:
-                                                           ^(MTRUnitTestingClusterTestEnumsResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                               NSLog(@"Values: %@", values);
-                                                               if (error == nil) {
-                                                                   constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEnumsResponse::Id;
-                                                                   RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                               }
-                                                               responsesNeeded--;
-                                                               if (error != nil) {
-                                                                   mError = error;
-                                                                   LogNSError("Error", error);
-                                                                   constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEnumsResponse::Id;
-                                                                   RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                               }
-                                                               if (responsesNeeded == 0) {
-                                                                   SetCommandExitStatus(mError);
-                                                               }
-                                                           }];
+                    ^(MTRUnitTestingClusterTestEnumsResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEnumsResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEnumsResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -162802,23 +162802,23 @@ class UnitTestingTestNullableOptionalRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testNullableOptionalRequestWithParams:params completion:
-                                                                      ^(MTRUnitTestingClusterTestNullableOptionalResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                          NSLog(@"Values: %@", values);
-                                                                          if (error == nil) {
-                                                                              constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalResponse::Id;
-                                                                              RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                          }
-                                                                          responsesNeeded--;
-                                                                          if (error != nil) {
-                                                                              mError = error;
-                                                                              LogNSError("Error", error);
-                                                                              constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalResponse::Id;
-                                                                              RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                          }
-                                                                          if (responsesNeeded == 0) {
-                                                                              SetCommandExitStatus(mError);
-                                                                          }
-                                                                      }];
+                    ^(MTRUnitTestingClusterTestNullableOptionalResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestNullableOptionalResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -163010,23 +163010,23 @@ class UnitTestingTestComplexNullableOptionalRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testComplexNullableOptionalRequestWithParams:params completion:
-                                                                             ^(MTRUnitTestingClusterTestComplexNullableOptionalResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                                 NSLog(@"Values: %@", values);
-                                                                                 if (error == nil) {
-                                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestComplexNullableOptionalResponse::Id;
-                                                                                     RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                                 }
-                                                                                 responsesNeeded--;
-                                                                                 if (error != nil) {
-                                                                                     mError = error;
-                                                                                     LogNSError("Error", error);
-                                                                                     constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestComplexNullableOptionalResponse::Id;
-                                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                                 }
-                                                                                 if (responsesNeeded == 0) {
-                                                                                     SetCommandExitStatus(mError);
-                                                                                 }
-                                                                             }];
+                    ^(MTRUnitTestingClusterTestComplexNullableOptionalResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestComplexNullableOptionalResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestComplexNullableOptionalResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -163083,23 +163083,23 @@ class UnitTestingSimpleStructEchoRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster simpleStructEchoRequestWithParams:params completion:
-                                                                  ^(MTRUnitTestingClusterSimpleStructResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                      NSLog(@"Values: %@", values);
-                                                                      if (error == nil) {
-                                                                          constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::SimpleStructResponse::Id;
-                                                                          RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                      }
-                                                                      responsesNeeded--;
-                                                                      if (error != nil) {
-                                                                          mError = error;
-                                                                          LogNSError("Error", error);
-                                                                          constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::SimpleStructResponse::Id;
-                                                                          RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                      }
-                                                                      if (responsesNeeded == 0) {
-                                                                          SetCommandExitStatus(mError);
-                                                                      }
-                                                                  }];
+                    ^(MTRUnitTestingClusterSimpleStructResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::SimpleStructResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::SimpleStructResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -163135,17 +163135,17 @@ class UnitTestingTimedInvokeRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster timedInvokeRequestWithParams:params completion:
-                                                             ^(NSError * _Nullable error) {
-                                                                 responsesNeeded--;
-                                                                 if (error != nil) {
-                                                                     mError = error;
-                                                                     LogNSError("Error", error);
-                                                                     RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                 }
-                                                                 if (responsesNeeded == 0) {
-                                                                     SetCommandExitStatus(mError);
-                                                                 }
-                                                             }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -163185,17 +163185,17 @@ class UnitTestingTestSimpleOptionalArgumentRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testSimpleOptionalArgumentRequestWithParams:params completion:
-                                                                            ^(NSError * _Nullable error) {
-                                                                                responsesNeeded--;
-                                                                                if (error != nil) {
-                                                                                    mError = error;
-                                                                                    LogNSError("Error", error);
-                                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                                                }
-                                                                                if (responsesNeeded == 0) {
-                                                                                    SetCommandExitStatus(mError);
-                                                                                }
-                                                                            }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -163236,23 +163236,23 @@ class UnitTestingTestEmitTestEventRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testEmitTestEventRequestWithParams:params completion:
-                                                                   ^(MTRUnitTestingClusterTestEmitTestEventResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                       NSLog(@"Values: %@", values);
-                                                                       if (error == nil) {
-                                                                           constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventResponse::Id;
-                                                                           RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                       }
-                                                                       responsesNeeded--;
-                                                                       if (error != nil) {
-                                                                           mError = error;
-                                                                           LogNSError("Error", error);
-                                                                           constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventResponse::Id;
-                                                                           RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                       }
-                                                                       if (responsesNeeded == 0) {
-                                                                           SetCommandExitStatus(mError);
-                                                                       }
-                                                                   }];
+                    ^(MTRUnitTestingClusterTestEmitTestEventResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestEventResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -163289,23 +163289,23 @@ class UnitTestingTestEmitTestFabricScopedEventRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testEmitTestFabricScopedEventRequestWithParams:params completion:
-                                                                               ^(MTRUnitTestingClusterTestEmitTestFabricScopedEventResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                                   NSLog(@"Values: %@", values);
-                                                                                   if (error == nil) {
-                                                                                       constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestFabricScopedEventResponse::Id;
-                                                                                       RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                                   }
-                                                                                   responsesNeeded--;
-                                                                                   if (error != nil) {
-                                                                                       mError = error;
-                                                                                       LogNSError("Error", error);
-                                                                                       constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestFabricScopedEventResponse::Id;
-                                                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                                   }
-                                                                                   if (responsesNeeded == 0) {
-                                                                                       SetCommandExitStatus(mError);
-                                                                                   }
-                                                                               }];
+                    ^(MTRUnitTestingClusterTestEmitTestFabricScopedEventResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestFabricScopedEventResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestEmitTestFabricScopedEventResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -163359,23 +163359,23 @@ class UnitTestingTestBatchHelperRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testBatchHelperRequestWithParams:params completion:
-                                                                 ^(MTRUnitTestingClusterTestBatchHelperResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                     NSLog(@"Values: %@", values);
-                                                                     if (error == nil) {
-                                                                         constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestBatchHelperResponse::Id;
-                                                                         RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                     }
-                                                                     responsesNeeded--;
-                                                                     if (error != nil) {
-                                                                         mError = error;
-                                                                         LogNSError("Error", error);
-                                                                         constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestBatchHelperResponse::Id;
-                                                                         RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                     }
-                                                                     if (responsesNeeded == 0) {
-                                                                         SetCommandExitStatus(mError);
-                                                                     }
-                                                                 }];
+                    ^(MTRUnitTestingClusterTestBatchHelperResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestBatchHelperResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestBatchHelperResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -163430,23 +163430,23 @@ class UnitTestingTestSecondBatchHelperRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testSecondBatchHelperRequestWithParams:params completion:
-                                                                       ^(MTRUnitTestingClusterTestBatchHelperResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                           NSLog(@"Values: %@", values);
-                                                                           if (error == nil) {
-                                                                               constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestBatchHelperResponse::Id;
-                                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                           }
-                                                                           responsesNeeded--;
-                                                                           if (error != nil) {
-                                                                               mError = error;
-                                                                               LogNSError("Error", error);
-                                                                               constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestBatchHelperResponse::Id;
-                                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                           }
-                                                                           if (responsesNeeded == 0) {
-                                                                               SetCommandExitStatus(mError);
-                                                                           }
-                                                                       }];
+                    ^(MTRUnitTestingClusterTestBatchHelperResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestBatchHelperResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestBatchHelperResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -163489,23 +163489,23 @@ class UnitTestingStringEchoRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster stringEchoRequestWithParams:params completion:
-                                                            ^(MTRUnitTestingClusterStringEchoResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                NSLog(@"Values: %@", values);
-                                                                if (error == nil) {
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::StringEchoResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                }
-                                                                responsesNeeded--;
-                                                                if (error != nil) {
-                                                                    mError = error;
-                                                                    LogNSError("Error", error);
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::StringEchoResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                }
-                                                                if (responsesNeeded == 0) {
-                                                                    SetCommandExitStatus(mError);
-                                                                }
-                                                            }];
+                    ^(MTRUnitTestingClusterStringEchoResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::StringEchoResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::StringEchoResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -163570,23 +163570,23 @@ class UnitTestingGlobalEchoRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster globalEchoRequestWithParams:params completion:
-                                                            ^(MTRUnitTestingClusterGlobalEchoResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                NSLog(@"Values: %@", values);
-                                                                if (error == nil) {
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::GlobalEchoResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                }
-                                                                responsesNeeded--;
-                                                                if (error != nil) {
-                                                                    mError = error;
-                                                                    LogNSError("Error", error);
-                                                                    constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::GlobalEchoResponse::Id;
-                                                                    RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                }
-                                                                if (responsesNeeded == 0) {
-                                                                    SetCommandExitStatus(mError);
-                                                                }
-                                                            }];
+                    ^(MTRUnitTestingClusterGlobalEchoResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::GlobalEchoResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::GlobalEchoResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -163630,23 +163630,23 @@ class UnitTestingTestDifferentVendorMeiRequest : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster testDifferentVendorMeiRequestWithParams:params completion:
-                                                                        ^(MTRUnitTestingClusterTestDifferentVendorMeiResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                                            NSLog(@"Values: %@", values);
-                                                                            if (error == nil) {
-                                                                                constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestDifferentVendorMeiResponse::Id;
-                                                                                RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                                            }
-                                                                            responsesNeeded--;
-                                                                            if (error != nil) {
-                                                                                mError = error;
-                                                                                LogNSError("Error", error);
-                                                                                constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestDifferentVendorMeiResponse::Id;
-                                                                                RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                                            }
-                                                                            if (responsesNeeded == 0) {
-                                                                                SetCommandExitStatus(mError);
-                                                                            }
-                                                                        }];
+                    ^(MTRUnitTestingClusterTestDifferentVendorMeiResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestDifferentVendorMeiResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::UnitTesting::Commands::TestDifferentVendorMeiResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -175603,17 +175603,17 @@ class SampleMeiPing : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster pingWithParams:params completion:
-                                               ^(NSError * _Nullable error) {
-                                                   responsesNeeded--;
-                                                   if (error != nil) {
-                                                       mError = error;
-                                                       LogNSError("Error", error);
-                                                       RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
-                                                   }
-                                                   if (responsesNeeded == 0) {
-                                                       SetCommandExitStatus(mError);
-                                                   }
-                                               }];
+                    ^(NSError * _Nullable error) {
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }
@@ -175661,23 +175661,23 @@ class SampleMeiAddArguments : public ClusterCommand {
         uint16_t __block responsesNeeded = repeatCount;
         while (repeatCount--) {
             [cluster addArgumentsWithParams:params completion:
-                                                       ^(MTRSampleMEIClusterAddArgumentsResponseParams * _Nullable values, NSError * _Nullable error) {
-                                                           NSLog(@"Values: %@", values);
-                                                           if (error == nil) {
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::SampleMei::Commands::AddArgumentsResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
-                                                           }
-                                                           responsesNeeded--;
-                                                           if (error != nil) {
-                                                               mError = error;
-                                                               LogNSError("Error", error);
-                                                               constexpr chip::CommandId responseId = chip::app::Clusters::SampleMei::Commands::AddArgumentsResponse::Id;
-                                                               RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
-                                                           }
-                                                           if (responsesNeeded == 0) {
-                                                               SetCommandExitStatus(mError);
-                                                           }
-                                                       }];
+                    ^(MTRSampleMEIClusterAddArgumentsResponseParams * _Nullable values, NSError * _Nullable error) {
+                        NSLog(@"Values: %@", values);
+                        if (error == nil) {
+                            constexpr chip::CommandId responseId = chip::app::Clusters::SampleMei::Commands::AddArgumentsResponse::Id;
+                            RemoteDataModelLogger::LogCommandAsJSON(@(endpointId), @(clusterId), @(responseId), values);
+                        }
+                        responsesNeeded--;
+                        if (error != nil) {
+                            mError = error;
+                            LogNSError("Error", error);
+                            constexpr chip::CommandId responseId = chip::app::Clusters::SampleMei::Commands::AddArgumentsResponse::Id;
+                            RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(responseId), error);
+                        }
+                        if (responsesNeeded == 0) {
+                            SetCommandExitStatus(mError);
+                        }
+                    }];
         }
         return CHIP_NO_ERROR;
     }