diff --git a/recipes-core/barton-common/barton-common_0.1.1.bb b/recipes-core/barton-common/barton-common_0.1.1.bb
new file mode 100644
index 0000000..a0ddf92
--- /dev/null
+++ b/recipes-core/barton-common/barton-common_0.1.1.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "Barton IoT Platform Library"
+HOMEPAGE = "https://github.com/rdkcentral/BartonCommon"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1079582effd6f382a3fba8297d579b46"
+
+DEPENDS:append = " \
+    cjson \
+    curl \
+    dbus \
+    glib-2.0 \
+    mbedtls \
+    libxml2 \
+"
+
+SRC_URI = "git://git@github.com/rdkcentral/BartonCommon.git;protocol=ssh;name=barton;nobranch=1"
+SRCREV = "aadf6f2b18991deb9bd261adb8125e3caa4abfcd"
+S = "${WORKDIR}/git"
+PR = "r0"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE = "\
+    -DBUILD_TESTING=OFF \
+"
+
+do_install() {
+    install -d ${D}/${libdir}
+    # Copy static libraries to ${libdir}
+    find ${WORKDIR}/build -name "*.a" -exec cp {} ${D}/${libdir}/ \;
+
+    install -d ${D}${includedir}
+
+    # Copy any subdirectory of ${S}/libs/*/c/public to ${includedir}
+    for dir in ${S}/libs/*/c/public; do
+        if [ -d "$dir" ]; then
+            cp -r --no-preserve=ownership "$dir"/* ${D}${includedir}
+        fi
+    done
+
+    # device helper special case
+    cp -r --no-preserve=ownership ${S}/libs/device/helper/c/public/* ${D}${includedir}
+}
+
+FILES_${PN}-dev += "${libdir}/*.a"
+FILES_${PN}-dev += "${includedir}"
diff --git a/recipes-core/barton-core/barton_git.bb b/recipes-core/barton-core/barton_git.bb
new file mode 100644
index 0000000..9f46f68
--- /dev/null
+++ b/recipes-core/barton-core/barton_git.bb
@@ -0,0 +1,82 @@
+DESCRIPTION = "Barton IoT Platform Library"
+HOMEPAGE = "https://github.com/rdkcentral/BartonCore"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1079582effd6f382a3fba8297d579b46"
+
+DEPENDS:append = " \
+    cjson \
+    curl \
+    dbus \
+    glib-2.0 \
+    mbedtls \
+    libxml2 \
+    barton-common \
+"
+
+RPROVIDES_${PN} += "barton"
+
+SRC_URI = "git://git@github.com/rdkcentral/BartonCore.git;protocol=ssh;name=barton;nobranch=1"
+SRCREV = "194b866acada6f143e5c6982dacec9b5793b710d"
+S = "${WORKDIR}/git"
+PR = "r0"
+
+BPV = "2.2.0"
+PV = "${BPV}+git"
+
+inherit cmake pkgconfig
+
+# These options provide a convenient facade in front of bitbake dependency management. A client
+# can choose to just overwrite EXTRA_OECMAKE options directly if they wish but must be mindful of
+# dependencies.
+BARTON_BUILD_REFERENCE ?= "OFF"
+BARTON_BUILD_MATTER ?= "OFF"
+BARTON_BUILD_THREAD ?= "OFF"
+BARTON_BUILD_ZIGBEE ?= "OFF"
+BARTON_GEN_GIR ?= "OFF"
+BARTON_BUILD_TESTS ?= "OFF"
+EXTRA_OECMAKE = "\
+    -DBCORE_BUILD_REFERENCE=${BARTON_BUILD_REFERENCE} \
+    -DBCORE_GEN_GIR=${BARTON_GEN_GIR} \
+    -DBUILD_TESTING=${BARTON_BUILD_TESTS} \
+    -DBCORE_MATTER=${BARTON_BUILD_MATTER} \
+    -DBCORE_THREAD=${BARTON_BUILD_THREAD} \
+    -DBCORE_ZIGBEE=${BARTON_BUILD_ZIGBEE} \
+    -DBCORE_BUILD_THIRD_PARTY_BARTON_COMMON=OFF \
+"
+
+DEPENDS:append = "${@bb.utils.contains('BARTON_BUILD_REFERENCE', 'ON', ' barton-linenoise', '', d)}"
+DEPENDS:append = "${@bb.utils.contains('BARTON_BUILD_MATTER', 'ON', ' barton-matter jsoncpp', '', d)}"
+DEPENDS:append = "${@bb.utils.contains('BARTON_BUILD_THREAD', 'ON', ' otbr-agent', '', d)}"
+RDEPENDS_${PN}:append = "${@bb.utils.contains('BARTON_BUILD_THREAD', 'ON', ' otbr-agent', '', d)}"
+DEPENDS:append = "${@bb.utils.contains('BARTON_BUILD_TESTS', 'ON', ' cmocka gtest', '', d)}"
+#TODO: zigbee
+#TODO: gir generation - Barton cmake looks for the existence of g-ir tools and does the generation on its own. We do not use gobject-introspection.bbclass at this time.
+
+do_install:append() {
+    install -d ${D}${includedir}/barton
+
+    # Install public API headers
+    if [ -d ${S}/api/c/public ]; then
+        cp -r --no-preserve=ownership ${S}/api/c/public/* ${D}${includedir}/barton/
+    else
+        echo "Warning: No public API headers found in ${S}/api/c/public"
+        exit 1
+    fi
+
+    # BartonCore CMake does not generate install instructions for the reference app
+    if "${@bb.utils.contains('BARTON_BUILD_REFERENCE', 'ON', 'true', 'false', d)}"; then
+        install -d ${D}${bindir}
+        install -m 0755 ${WORKDIR}/build/reference/barton-core-reference ${D}${bindir}/barton-core-reference
+    fi
+}
+
+FILES_${PN} += "${@bb.utils.contains('BARTON_BUILD_REFERENCE', 'ON', '${bindir}/barton-core-reference', '', d)}"
+
+# Define what goes in the main runtime package
+FILES_${PN} += "${libdir}/libBartonCore.so.*"
+
+# Ensure the dev package contains the public API headers
+FILES_${PN}-dev += "${includedir}/barton/"
+
+# Skip QA check for .so files in the -dev package
+INSANE_SKIP_${PN}-dev += "dev-elf"
diff --git a/recipes-matter/barton-matter-example/barton-matter_1.4.2.bbappend b/recipes-matter/barton-matter-example/barton-matter_1.4.2.bbappend
index 20ed384..c26b0dc 100644
--- a/recipes-matter/barton-matter-example/barton-matter_1.4.2.bbappend
+++ b/recipes-matter/barton-matter-example/barton-matter_1.4.2.bbappend
@@ -1,6 +1,9 @@
 # Example customization for barton-matter
 # This shows how to customize the Matter configuration for your specific product
 
+# increment when changing anything in this bbappend
+PR:append = ".1"
+
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI += " \
diff --git a/recipes-matter/barton-matter-example/files/barton.matter b/recipes-matter/barton-matter-example/files/barton.matter
index 2bbe973..c32e2cb 100644
--- a/recipes-matter/barton-matter-example/files/barton.matter
+++ b/recipes-matter/barton-matter-example/files/barton.matter
@@ -1961,6 +1961,7 @@ endpoint 0 {
     callback attribute capabilityMinima;
     callback attribute specificationVersion;
     callback attribute maxPathsPerInvoke;
+    ram      attribute configurationVersion default = 1;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
@@ -2038,31 +2039,6 @@ endpoint 0 {
     handle command TimeSnapshotResponse;
   }
 
-  server cluster ThreadNetworkDiagnostics {
-    callback attribute channel;
-    callback attribute routingRole;
-    callback attribute networkName;
-    callback attribute panId;
-    callback attribute extendedPanId;
-    callback attribute meshLocalPrefix;
-    callback attribute neighborTable;
-    callback attribute routeTable;
-    callback attribute partitionId;
-    callback attribute weighting;
-    callback attribute dataVersion;
-    callback attribute stableDataVersion;
-    callback attribute leaderRouterId;
-    callback attribute securityPolicy;
-    callback attribute channelPage0Mask;
-    callback attribute operationalDatasetComponents;
-    callback attribute activeNetworkFaultsList;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 0;
-    ram      attribute clusterRevision default = 2;
-  }
-
   server cluster WiFiNetworkDiagnostics {
     callback attribute bssid;
     callback attribute securityType;
@@ -2123,6 +2099,9 @@ endpoint 0 {
     handle command UpdateFabricLabel;
     handle command RemoveFabric;
     handle command AddTrustedRootCertificate;
+    handle command SetVIDVerificationStatement;
+    handle command SignVIDVerificationRequest;
+    handle command SignVIDVerificationResponse;
   }
 
   server cluster GroupKeyManagement {
@@ -2169,6 +2148,33 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 
+  server cluster ThreadNetworkDiagnostics {
+    callback attribute channel;
+    callback attribute routingRole;
+    callback attribute networkName;
+    callback attribute panId;
+    callback attribute extendedPanId;
+    callback attribute meshLocalPrefix;
+    callback attribute neighborTable;
+    callback attribute routeTable;
+    callback attribute partitionId;
+    callback attribute weighting;
+    callback attribute dataVersion;
+    callback attribute stableDataVersion;
+    callback attribute leaderRouterId;
+    callback attribute securityPolicy;
+    callback attribute channelPage0Mask;
+    callback attribute operationalDatasetComponents;
+    callback attribute activeNetworkFaultsList;
+    callback attribute extAddress;
+    callback attribute rloc16;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 3;
+  }
+
   server cluster WiFiNetworkManagement {
     callback attribute ssid;
     callback attribute passphraseSurrogate;
diff --git a/recipes-matter/barton-matter-example/files/barton.zap b/recipes-matter/barton-matter-example/files/barton.zap
index 6f4eb48..9ffcbdc 100644
--- a/recipes-matter/barton-matter-example/files/barton.zap
+++ b/recipes-matter/barton-matter-example/files/barton.zap
@@ -1,6 +1,6 @@
 {
   "fileFormat": 2,
-  "featureLevel": 103,
+  "featureLevel": 107,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -34,14 +34,16 @@
         "code": 22,
         "profileId": 259,
         "label": "MA-rootdevice",
-        "name": "MA-rootdevice"
+        "name": "MA-rootdevice",
+        "deviceTypeOrder": 0
       },
       "deviceTypes": [
         {
           "code": 22,
           "profileId": 259,
           "label": "MA-rootdevice",
-          "name": "MA-rootdevice"
+          "name": "MA-rootdevice",
+          "deviceTypeOrder": 0
         }
       ],
       "deviceVersions": [
@@ -158,22 +160,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -280,22 +266,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -466,22 +436,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -529,7 +483,7 @@
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            } 
+            }
           ]
         },
         {
@@ -781,24 +735,24 @@
               "reportableChange": 0
             },
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "ConfigurationVersion",
+              "code": 24,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int32u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 1,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -813,8 +767,8 @@
               "reportableChange": 0
             },
             {
-              "name": "EventList",
-              "code": 65530,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -958,22 +912,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -1080,22 +1018,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -1316,22 +1238,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -1534,22 +1440,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -1730,22 +1620,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -1797,19 +1671,19 @@
           ]
         },
         {
-          "name": "Thread Network Diagnostics",
-          "code": 53,
+          "name": "Wi-Fi Network Diagnostics",
+          "code": 54,
           "mfgCode": null,
-          "define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
+          "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
           "side": "server",
           "enabled": 1,
           "attributes": [
             {
-              "name": "Channel",
+              "name": "BSSID",
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "octet_string",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1821,11 +1695,11 @@
               "reportableChange": 0
             },
             {
-              "name": "RoutingRole",
+              "name": "SecurityType",
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "RoutingRoleEnum",
+              "type": "SecurityTypeEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1837,11 +1711,11 @@
               "reportableChange": 0
             },
             {
-              "name": "NetworkName",
+              "name": "WiFiVersion",
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "char_string",
+              "type": "WiFiVersionEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1853,7 +1727,7 @@
               "reportableChange": 0
             },
             {
-              "name": "PanId",
+              "name": "ChannelNumber",
               "code": 3,
               "mfgCode": null,
               "side": "server",
@@ -1869,11 +1743,11 @@
               "reportableChange": 0
             },
             {
-              "name": "ExtendedPanId",
+              "name": "RSSI",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "int64u",
+              "type": "int8s",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1885,11 +1759,11 @@
               "reportableChange": 0
             },
             {
-              "name": "MeshLocalPrefix",
-              "code": 5,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
-              "type": "octet_string",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1901,8 +1775,8 @@
               "reportableChange": 0
             },
             {
-              "name": "NeighborTable",
-              "code": 7,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -1917,8 +1791,8 @@
               "reportableChange": 0
             },
             {
-              "name": "RouteTable",
-              "code": 8,
+              "name": "AttributeList",
+              "code": 65531,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -1933,43 +1807,53 @@
               "reportableChange": 0
             },
             {
-              "name": "PartitionId",
-              "code": 9,
+              "name": "FeatureMap",
+              "code": 65532,
               "mfgCode": null,
               "side": "server",
-              "type": "int32u",
+              "type": "bitmap32",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "Weighting",
-              "code": 10,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            },
+            }
+          ]
+        },
+        {
+          "name": "Ethernet Network Diagnostics",
+          "code": 55,
+          "mfgCode": null,
+          "define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
             {
-              "name": "DataVersion",
-              "code": 11,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1981,11 +1865,11 @@
               "reportableChange": 0
             },
             {
-              "name": "StableDataVersion",
-              "code": 12,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -1997,11 +1881,11 @@
               "reportableChange": 0
             },
             {
-              "name": "LeaderRouterId",
-              "code": 13,
+              "name": "AttributeList",
+              "code": 65531,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2013,43 +1897,71 @@
               "reportableChange": 0
             },
             {
-              "name": "SecurityPolicy",
-              "code": 59,
+              "name": "FeatureMap",
+              "code": 65532,
               "mfgCode": null,
               "side": "server",
-              "type": "SecurityPolicy",
+              "type": "bitmap32",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ChannelPage0Mask",
-              "code": 60,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
               "side": "server",
-              "type": "octet_string",
+              "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
+            }
+          ]
+        },
+        {
+          "name": "Administrator Commissioning",
+          "code": 60,
+          "mfgCode": null,
+          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "OpenCommissioningWindow",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
             },
             {
-              "name": "OperationalDatasetComponents",
-              "code": 61,
+              "name": "RevokeCommissioning",
+              "code": 2,
               "mfgCode": null,
-              "side": "server",
-              "type": "OperationalDatasetComponents",
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "WindowStatus",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2061,11 +1973,11 @@
               "reportableChange": 0
             },
             {
-              "name": "ActiveNetworkFaultsList",
-              "code": 62,
+              "name": "AdminFabricIndex",
+              "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "fabric_idx",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2077,11 +1989,11 @@
               "reportableChange": 0
             },
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "AdminVendorId",
+              "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "vendor_id",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2093,8 +2005,8 @@
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -2109,8 +2021,8 @@
               "reportableChange": 0
             },
             {
-              "name": "EventList",
-              "code": 65530,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -2166,7 +2078,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2175,19 +2087,141 @@
           ]
         },
         {
-          "name": "Wi-Fi Network Diagnostics",
-          "code": 54,
+          "name": "Operational Credentials",
+          "code": 62,
           "mfgCode": null,
-          "define": "WIFI_NETWORK_DIAGNOSTICS_CLUSTER",
+          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "commands": [
+            {
+              "name": "AttestationRequest",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AttestationResponse",
+              "code": 1,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "CertificateChainRequest",
+              "code": 2,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "CertificateChainResponse",
+              "code": 3,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "CSRRequest",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "CSRResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddNOC",
+              "code": 6,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "UpdateNOC",
+              "code": 7,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "NOCResponse",
+              "code": 8,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "UpdateFabricLabel",
+              "code": 9,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "RemoveFabric",
+              "code": 10,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "AddTrustedRootCertificate",
+              "code": 11,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "SetVIDVerificationStatement",
+              "code": 12,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "SignVIDVerificationRequest",
+              "code": 13,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "SignVIDVerificationResponse",
+              "code": 14,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
           "attributes": [
             {
-              "name": "BSSID",
+              "name": "NOCs",
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "octet_string",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2199,11 +2233,11 @@
               "reportableChange": 0
             },
             {
-              "name": "SecurityType",
+              "name": "Fabrics",
               "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "SecurityTypeEnum",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2215,11 +2249,11 @@
               "reportableChange": 0
             },
             {
-              "name": "WiFiVersion",
+              "name": "SupportedFabrics",
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "WiFiVersionEnum",
+              "type": "int8u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2231,11 +2265,11 @@
               "reportableChange": 0
             },
             {
-              "name": "ChannelNumber",
+              "name": "CommissionedFabrics",
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "int8u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2247,11 +2281,11 @@
               "reportableChange": 0
             },
             {
-              "name": "RSSI",
+              "name": "TrustedRootCertificates",
               "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "int8s",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2263,11 +2297,11 @@
               "reportableChange": 0
             },
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "CurrentFabricIndex",
+              "code": 5,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int8u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2279,8 +2313,8 @@
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -2295,8 +2329,8 @@
               "reportableChange": 0
             },
             {
-              "name": "EventList",
-              "code": 65530,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -2361,16 +2395,66 @@
           ]
         },
         {
-          "name": "Ethernet Network Diagnostics",
-          "code": 55,
+          "name": "Group Key Management",
+          "code": 63,
           "mfgCode": null,
-          "define": "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER",
+          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
           "side": "server",
           "enabled": 1,
+          "commands": [
+            {
+              "name": "KeySetWrite",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetRead",
+              "code": 1,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadResponse",
+              "code": 2,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetRemove",
+              "code": 3,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadAllIndices",
+              "code": 4,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            },
+            {
+              "name": "KeySetReadAllIndicesResponse",
+              "code": 5,
+              "mfgCode": null,
+              "source": "server",
+              "isIncoming": 0,
+              "isEnabled": 1
+            }
+          ],
           "attributes": [
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "GroupKeyMap",
+              "code": 0,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -2385,8 +2469,8 @@
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "GroupTable",
+              "code": 1,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -2401,11 +2485,11 @@
               "reportableChange": 0
             },
             {
-              "name": "EventList",
-              "code": 65530,
+              "name": "MaxGroupsPerFabric",
+              "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2417,120 +2501,12 @@
               "reportableChange": 0
             },
             {
-              "name": "AttributeList",
-              "code": 65531,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "FeatureMap",
-              "code": 65532,
-              "mfgCode": null,
-              "side": "server",
-              "type": "bitmap32",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "0",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "MaxGroupKeysPerFabric",
+              "code": 3,
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "1",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Administrator Commissioning",
-          "code": 60,
-          "mfgCode": null,
-          "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "OpenCommissioningWindow",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "RevokeCommissioning",
-              "code": 2,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "WindowStatus",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "CommissioningWindowStatusEnum",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AdminFabricIndex",
-              "code": 1,
-              "mfgCode": null,
-              "side": "server",
-              "type": "fabric_idx",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
-            {
-              "name": "AdminVendorId",
-              "code": 2,
-              "mfgCode": null,
-              "side": "server",
-              "type": "vendor_id",
-              "included": 1,
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
@@ -2572,22 +2548,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -2611,10 +2571,10 @@
               "side": "server",
               "type": "bitmap32",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -2627,125 +2587,58 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             }
           ]
-        },
+        }
+      ]
+    },
+    {
+      "id": 2,
+      "name": "Anonymous Endpoint Type",
+      "deviceTypeRef": {
+        "code": 144,
+        "profileId": 259,
+        "label": "MA-network-infrastructure-manager",
+        "name": "MA-network-infrastructure-manager",
+        "deviceTypeOrder": 0
+      },
+      "deviceTypes": [
         {
-          "name": "Operational Credentials",
-          "code": 62,
+          "code": 144,
+          "profileId": 259,
+          "label": "MA-network-infrastructure-manager",
+          "name": "MA-network-infrastructure-manager",
+          "deviceTypeOrder": 0
+        }
+      ],
+      "deviceVersions": [
+        1
+      ],
+      "deviceIdentifiers": [
+        144
+      ],
+      "deviceTypeName": "MA-network-infrastructure-manager",
+      "deviceTypeCode": 144,
+      "deviceTypeProfileId": 259,
+      "clusters": [
+        {
+          "name": "Descriptor",
+          "code": 29,
           "mfgCode": null,
-          "define": "OPERATIONAL_CREDENTIALS_CLUSTER",
+          "define": "DESCRIPTOR_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "commands": [
-            {
-              "name": "AttestationRequest",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "AttestationResponse",
-              "code": 1,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "CertificateChainRequest",
-              "code": 2,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "CertificateChainResponse",
-              "code": 3,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "CSRRequest",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "CSRResponse",
-              "code": 5,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "AddNOC",
-              "code": 6,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "UpdateNOC",
-              "code": 7,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "NOCResponse",
-              "code": 8,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "UpdateFabricLabel",
-              "code": 9,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "RemoveFabric",
-              "code": 10,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "AddTrustedRootCertificate",
-              "code": 11,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            }
-          ],
           "attributes": [
             {
-              "name": "NOCs",
+              "name": "DeviceTypeList",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -2761,7 +2654,7 @@
               "reportableChange": 0
             },
             {
-              "name": "Fabrics",
+              "name": "ServerList",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -2777,11 +2670,11 @@
               "reportableChange": 0
             },
             {
-              "name": "SupportedFabrics",
+              "name": "ClientList",
               "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2793,11 +2686,11 @@
               "reportableChange": 0
             },
             {
-              "name": "CommissionedFabrics",
+              "name": "PartsList",
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2809,8 +2702,8 @@
               "reportableChange": 0
             },
             {
-              "name": "TrustedRootCertificates",
-              "code": 4,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -2825,11 +2718,11 @@
               "reportableChange": 0
             },
             {
-              "name": "CurrentFabricIndex",
-              "code": 5,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
-              "type": "int8u",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2841,8 +2734,8 @@
               "reportableChange": 0
             },
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "AttributeList",
+              "code": 65531,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -2857,11 +2750,11 @@
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "FeatureMap",
+              "code": 65532,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "bitmap32",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2873,11 +2766,11 @@
               "reportableChange": 0
             },
             {
-              "name": "EventList",
-              "code": 65530,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2887,10 +2780,20 @@
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            },
+            }
+          ]
+        },
+        {
+          "name": "Binding",
+          "code": 30,
+          "mfgCode": null,
+          "define": "BINDING_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
             {
-              "name": "AttributeList",
-              "code": 65531,
+              "name": "Binding",
+              "code": 0,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -2905,100 +2808,40 @@
               "reportableChange": 0
             },
             {
-              "name": "FeatureMap",
-              "code": 65532,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "array",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Group Key Management",
-          "code": 63,
-          "mfgCode": null,
-          "define": "GROUP_KEY_MANAGEMENT_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "commands": [
-            {
-              "name": "KeySetWrite",
-              "code": 0,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
             },
             {
-              "name": "KeySetRead",
-              "code": 1,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "KeySetReadResponse",
-              "code": 2,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            },
-            {
-              "name": "KeySetRemove",
-              "code": 3,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "KeySetReadAllIndices",
-              "code": 4,
-              "mfgCode": null,
-              "source": "client",
-              "isIncoming": 1,
-              "isEnabled": 1
-            },
-            {
-              "name": "KeySetReadAllIndicesResponse",
-              "code": 5,
-              "mfgCode": null,
-              "source": "server",
-              "isIncoming": 0,
-              "isEnabled": 1
-            }
-          ],
-          "attributes": [
-            {
-              "name": "GroupKeyMap",
-              "code": 0,
+              "name": "AttributeList",
+              "code": 65531,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -3013,40 +2856,50 @@
               "reportableChange": 0
             },
             {
-              "name": "GroupTable",
-              "code": 1,
+              "name": "FeatureMap",
+              "code": 65532,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "bitmap32",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "0",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "MaxGroupsPerFabric",
-              "code": 2,
+              "name": "ClusterRevision",
+              "code": 65533,
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            },
+            }
+          ]
+        },
+        {
+          "name": "Thread Network Diagnostics",
+          "code": 53,
+          "mfgCode": null,
+          "define": "THREAD_NETWORK_DIAGNOSTICS_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "attributes": [
             {
-              "name": "MaxGroupKeysPerFabric",
-              "code": 3,
+              "name": "Channel",
+              "code": 0,
               "mfgCode": null,
               "side": "server",
               "type": "int16u",
@@ -3061,11 +2914,11 @@
               "reportableChange": 0
             },
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "RoutingRole",
+              "code": 1,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "RoutingRoleEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3077,11 +2930,11 @@
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "NetworkName",
+              "code": 2,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "char_string",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3093,11 +2946,11 @@
               "reportableChange": 0
             },
             {
-              "name": "EventList",
-              "code": 65530,
+              "name": "PanId",
+              "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3109,11 +2962,11 @@
               "reportableChange": 0
             },
             {
-              "name": "AttributeList",
-              "code": 65531,
+              "name": "ExtendedPanId",
+              "code": 4,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int64u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3125,11 +2978,11 @@
               "reportableChange": 0
             },
             {
-              "name": "FeatureMap",
-              "code": 65532,
+              "name": "MeshLocalPrefix",
+              "code": 5,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "octet_string",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3141,11 +2994,11 @@
               "reportableChange": 0
             },
             {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "NeighborTable",
+              "code": 7,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3155,49 +3008,10 @@
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "id": 2,
-      "name": "Anonymous Endpoint Type",
-      "deviceTypeRef": {
-        "code": 144,
-        "profileId": 259,
-        "label": "MA-network-infrastructure-manager",
-        "name": "MA-network-infrastructure-manager"
-      },
-      "deviceTypes": [
-        {
-          "code": 144,
-          "profileId": 259,
-          "label": "MA-network-infrastructure-manager",
-          "name": "MA-network-infrastructure-manager"
-        }
-      ],
-      "deviceVersions": [
-        1
-      ],
-      "deviceIdentifiers": [
-        144
-      ],
-      "deviceTypeName": "MA-network-infrastructure-manager",
-      "deviceTypeCode": 144,
-      "deviceTypeProfileId": 259,
-      "clusters": [
-        {
-          "name": "Descriptor",
-          "code": 29,
-          "mfgCode": null,
-          "define": "DESCRIPTOR_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
+            },
             {
-              "name": "DeviceTypeList",
-              "code": 0,
+              "name": "RouteTable",
+              "code": 8,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -3212,11 +3026,11 @@
               "reportableChange": 0
             },
             {
-              "name": "ServerList",
-              "code": 1,
+              "name": "PartitionId",
+              "code": 9,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int32u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3228,11 +3042,11 @@
               "reportableChange": 0
             },
             {
-              "name": "ClientList",
-              "code": 2,
+              "name": "Weighting",
+              "code": 10,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3244,11 +3058,11 @@
               "reportableChange": 0
             },
             {
-              "name": "PartsList",
-              "code": 3,
+              "name": "DataVersion",
+              "code": 11,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3260,11 +3074,11 @@
               "reportableChange": 0
             },
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "StableDataVersion",
+              "code": 12,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int16u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3276,11 +3090,11 @@
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "LeaderRouterId",
+              "code": 13,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int8u",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3292,11 +3106,11 @@
               "reportableChange": 0
             },
             {
-              "name": "EventList",
-              "code": 65530,
+              "name": "SecurityPolicy",
+              "code": 59,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "SecurityPolicy",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3308,11 +3122,11 @@
               "reportableChange": 0
             },
             {
-              "name": "AttributeList",
-              "code": 65531,
+              "name": "ChannelPage0Mask",
+              "code": 60,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "octet_string",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3324,11 +3138,11 @@
               "reportableChange": 0
             },
             {
-              "name": "FeatureMap",
-              "code": 65532,
+              "name": "OperationalDatasetComponents",
+              "code": 61,
               "mfgCode": null,
               "side": "server",
-              "type": "bitmap32",
+              "type": "OperationalDatasetComponents",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3340,11 +3154,11 @@
               "reportableChange": 0
             },
             {
-              "name": "ClusterRevision",
-              "code": 65533,
+              "name": "ActiveNetworkFaultsList",
+              "code": 62,
               "mfgCode": null,
               "side": "server",
-              "type": "int16u",
+              "type": "array",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3354,52 +3168,42 @@
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
-            }
-          ]
-        },
-        {
-          "name": "Binding",
-          "code": 30,
-          "mfgCode": null,
-          "define": "BINDING_CLUSTER",
-          "side": "server",
-          "enabled": 1,
-          "attributes": [
+            },
             {
-              "name": "Binding",
-              "code": 0,
+              "name": "ExtAddress",
+              "code": 63,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int64u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "GeneratedCommandList",
-              "code": 65528,
+              "name": "Rloc16",
+              "code": 64,
               "mfgCode": null,
               "side": "server",
-              "type": "array",
+              "type": "int16u",
               "included": 1,
-              "storageOption": "External",
+              "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": null,
+              "defaultValue": "",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
             },
             {
-              "name": "AcceptedCommandList",
-              "code": 65529,
+              "name": "GeneratedCommandList",
+              "code": 65528,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -3414,8 +3218,8 @@
               "reportableChange": 0
             },
             {
-              "name": "EventList",
-              "code": 65530,
+              "name": "AcceptedCommandList",
+              "code": 65529,
               "mfgCode": null,
               "side": "server",
               "type": "array",
@@ -3471,7 +3275,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "3",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -3486,7 +3290,6 @@
           "define": "WIFI_NETWORK_MANAGEMENT_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "NetworkPassphraseRequest",
@@ -3570,22 +3373,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -3643,7 +3430,6 @@
           "define": "THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "GetActiveDatasetRequest",
@@ -3815,22 +3601,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -3888,7 +3658,6 @@
           "define": "THREAD_NETWORK_DIRECTORY_CLUSTER",
           "side": "server",
           "enabled": 1,
-          "apiMaturity": "provisional",
           "commands": [
             {
               "name": "AddNetwork",
@@ -4004,22 +3773,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -4079,14 +3832,16 @@
         "code": 20,
         "profileId": 259,
         "label": "MA-otaprovider",
-        "name": "MA-otaprovider"
+        "name": "MA-otaprovider",
+        "deviceTypeOrder": 0
       },
       "deviceTypes": [
         {
           "code": 20,
           "profileId": 259,
           "label": "MA-otaprovider",
-          "name": "MA-otaprovider"
+          "name": "MA-otaprovider",
+          "deviceTypeOrder": 0
         }
       ],
       "deviceVersions": [
@@ -4203,22 +3958,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -4325,22 +4064,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -4473,22 +4196,6 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
-            {
-              "name": "EventList",
-              "code": 65530,
-              "mfgCode": null,
-              "side": "server",
-              "type": "array",
-              "included": 1,
-              "storageOption": "External",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": null,
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "AttributeList",
               "code": 65531,
@@ -4568,4 +4275,4 @@
       "parentEndpointIdentifier": null
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/recipes-matter/barton-matter-example/files/zzz_generated.tar.gz b/recipes-matter/barton-matter-example/files/zzz_generated.tar.gz
index 5f152d6..eb3312f 100644
Binary files a/recipes-matter/barton-matter-example/files/zzz_generated.tar.gz and b/recipes-matter/barton-matter-example/files/zzz_generated.tar.gz differ