From e78498cca10735c8b6e92b888a9885377ee5b1fc Mon Sep 17 00:00:00 2001
From: Jakub Latusek <j.latusek@samsung.com>
Date: Tue, 30 Jul 2024 17:33:13 +0200
Subject: [PATCH 1/2] Python modifcation for check for fabricSynchronization
 condition on Agregator device (#34626)

* Check for FabricSynchronization condition on Aggregator device

* Update after code review

* Restyled by prettier-yaml

* Remove yaml with test

---------

Co-authored-by: Arkadiusz Bokowy <a.bokowy@samsung.com>
Co-authored-by: Restyled.io <commits@restyled.io>
---
 scripts/tests/chiptest/__init__.py        |  2 ++
 scripts/tests/chiptest/linux.py           |  1 +
 scripts/tests/chiptest/test_definition.py | 11 +++++++++--
 scripts/tests/run_test_suite.py           | 10 +++++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py
index 8d0950f379bae1..9d887a56580713 100644
--- a/scripts/tests/chiptest/__init__.py
+++ b/scripts/tests/chiptest/__init__.py
@@ -276,6 +276,8 @@ def target_for_name(name: str):
         return TestTarget.TV
     if name.startswith("DL_") or name.startswith("Test_TC_DRLK_"):
         return TestTarget.LOCK
+    if name.startswith("TestFabricSync"):
+        return TestTarget.FABRIC_SYNC
     if name.startswith("OTA_"):
         return TestTarget.OTA
     if name.startswith("Test_TC_BRBINFO_") or name.startswith("Test_TC_ACT_"):
diff --git a/scripts/tests/chiptest/linux.py b/scripts/tests/chiptest/linux.py
index 0a6df4cd671671..bf3e140981d3a7 100644
--- a/scripts/tests/chiptest/linux.py
+++ b/scripts/tests/chiptest/linux.py
@@ -178,6 +178,7 @@ def PathsWithNetworkNamespaces(paths: ApplicationPaths) -> ApplicationPaths:
         chip_tool='ip netns exec tool'.split() + paths.chip_tool,
         all_clusters_app='ip netns exec app'.split() + paths.all_clusters_app,
         lock_app='ip netns exec app'.split() + paths.lock_app,
+        fabric_bridge_app='ip netns exec app'.split() + paths.fabric_bridge_app,
         ota_provider_app='ip netns exec app'.split() + paths.ota_provider_app,
         ota_requestor_app='ip netns exec app'.split() + paths.ota_requestor_app,
         tv_app='ip netns exec app'.split() + paths.tv_app,
diff --git a/scripts/tests/chiptest/test_definition.py b/scripts/tests/chiptest/test_definition.py
index 57c43c27a1cbca..484f247f70b1b2 100644
--- a/scripts/tests/chiptest/test_definition.py
+++ b/scripts/tests/chiptest/test_definition.py
@@ -175,6 +175,7 @@ class TestTarget(Enum):
     OTA = auto()
     BRIDGE = auto()
     LIT_ICD = auto()
+    FABRIC_SYNC = auto()
     MWO = auto()
     RVC = auto()
     NETWORK_MANAGER = auto()
@@ -185,6 +186,7 @@ class ApplicationPaths:
     chip_tool: typing.List[str]
     all_clusters_app: typing.List[str]
     lock_app: typing.List[str]
+    fabric_bridge_app: typing.List[str]
     ota_provider_app: typing.List[str]
     ota_requestor_app: typing.List[str]
     tv_app: typing.List[str]
@@ -197,8 +199,11 @@ class ApplicationPaths:
     network_manager_app: typing.List[str]
 
     def items(self):
-        return [self.chip_tool, self.all_clusters_app, self.lock_app, self.ota_provider_app, self.ota_requestor_app,
-                self.tv_app, self.bridge_app, self.lit_icd_app, self.microwave_oven_app, self.chip_repl_yaml_tester_cmd, self.chip_tool_with_python_cmd, self.rvc_app, self.network_manager_app]
+        return [self.chip_tool, self.all_clusters_app, self.lock_app,
+                self.fabric_bridge_app, self.ota_provider_app, self.ota_requestor_app,
+                self.tv_app, self.bridge_app, self.lit_icd_app,
+                self.microwave_oven_app, self.chip_repl_yaml_tester_cmd,
+                self.chip_tool_with_python_cmd, self.rvc_app, self.network_manager_app]
 
 
 @dataclass
@@ -301,6 +306,8 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str,
                 target_app = paths.tv_app
             elif self.target == TestTarget.LOCK:
                 target_app = paths.lock_app
+            elif self.target == TestTarget.FABRIC_SYNC:
+                target_app = paths.fabric_bridge_app
             elif self.target == TestTarget.OTA:
                 target_app = paths.ota_requestor_app
             elif self.target == TestTarget.BRIDGE:
diff --git a/scripts/tests/run_test_suite.py b/scripts/tests/run_test_suite.py
index d546bb0803b6b9..41b7b540a6dd50 100755
--- a/scripts/tests/run_test_suite.py
+++ b/scripts/tests/run_test_suite.py
@@ -239,6 +239,9 @@ def cmd_list(context):
 @click.option(
     '--lock-app',
     help='what lock app to use')
+@click.option(
+    '--fabric-bridge-app',
+    help='what fabric bridge app to use')
 @click.option(
     '--ota-provider-app',
     help='what ota provider app to use')
@@ -294,7 +297,8 @@ def cmd_list(context):
     help='Number of tests that are expected to fail in each iteration.  Overall test will pass if the number of failures matches this.  Nonzero values require --keep-going')
 @click.pass_context
 def cmd_run(context, iterations, all_clusters_app, lock_app, ota_provider_app, ota_requestor_app,
-            tv_app, bridge_app, lit_icd_app, microwave_oven_app, rvc_app, network_manager_app, chip_repl_yaml_tester, chip_tool_with_python, pics_file, keep_going, test_timeout_seconds, expected_failures):
+            fabric_bridge_app, tv_app, bridge_app, lit_icd_app, microwave_oven_app, rvc_app, network_manager_app, chip_repl_yaml_tester,
+            chip_tool_with_python, pics_file, keep_going, test_timeout_seconds, expected_failures):
     if expected_failures != 0 and not keep_going:
         logging.exception(f"'--expected-failures {expected_failures}' used without '--keep-going'")
         sys.exit(2)
@@ -309,6 +313,9 @@ def cmd_run(context, iterations, all_clusters_app, lock_app, ota_provider_app, o
     if lock_app is None:
         lock_app = paths_finder.get('chip-lock-app')
 
+    if fabric_bridge_app is None:
+        fabric_bridge_app = paths_finder.get('fabric-bridge-app')
+
     if ota_provider_app is None:
         ota_provider_app = paths_finder.get('chip-ota-provider-app')
 
@@ -347,6 +354,7 @@ def cmd_run(context, iterations, all_clusters_app, lock_app, ota_provider_app, o
         chip_tool=[context.obj.chip_tool],
         all_clusters_app=[all_clusters_app],
         lock_app=[lock_app],
+        fabric_bridge_app=[fabric_bridge_app],
         ota_provider_app=[ota_provider_app],
         ota_requestor_app=[ota_requestor_app],
         tv_app=[tv_app],

From cc55c2a33784f43be1526ff17a1bc66f8235c02b Mon Sep 17 00:00:00 2001
From: C Freeman <cecille@google.com>
Date: Tue, 30 Jul 2024 11:46:38 -0400
Subject: [PATCH 2/2] DM XMLs: Update for TE2 (#34605)

* DM XML: Run new scrape

* Change tests to use ToT by default for TE

* add Humidistat to word list

* Add newly required feature to the acl cluster

* Ignore attributes in spec and not in SDk for TE

* fix spec parsing test for tot default
---
 .github/.wordlist.txt                         |   1 +
 data_model/master/clusters/ACL-Cluster.xml    | 134 +++++++-
 data_model/master/clusters/AccountLogin.xml   |   2 +-
 .../clusters/AdminCommissioningCluster.xml    |   2 +-
 data_model/master/clusters/AirQuality.xml     |   2 +-
 .../master/clusters/ApplicationBasic.xml      |   2 +-
 .../master/clusters/ApplicationLauncher.xml   |  18 +-
 data_model/master/clusters/AudioOutput.xml    |   2 +-
 .../clusters/BasicInformationCluster.xml      |  32 +-
 .../master/clusters/Binding-Cluster.xml       |   2 +-
 data_model/master/clusters/BooleanState.xml   |   2 +-
 .../clusters/BooleanStateConfiguration.xml    |   2 +-
 data_model/master/clusters/Channel.xml        |   2 +-
 .../clusters/CommissionerControlCluster.xml   |   2 +-
 .../master/clusters/ContentAppObserver.xml    |   2 +-
 data_model/master/clusters/ContentControl.xml |   2 +-
 .../master/clusters/ContentLauncher.xml       |   2 +-
 .../master/clusters/Descriptor-Cluster.xml    |   2 +-
 .../clusters/DeviceEnergyManagement.xml       |   2 +-
 .../master/clusters/DiagnosticLogsCluster.xml |   2 +-
 .../master/clusters/DiagnosticsEthernet.xml   |   2 +-
 .../master/clusters/DiagnosticsGeneral.xml    |   6 +-
 .../master/clusters/DiagnosticsSoftware.xml   |   2 +-
 .../master/clusters/DiagnosticsThread.xml     |  15 +-
 .../master/clusters/DiagnosticsWiFi.xml       |   2 +-
 data_model/master/clusters/DoorLock.xml       | 257 +--------------
 .../clusters/ElectricalEnergyMeasurement.xml  |   2 +-
 .../clusters/ElectricalPowerMeasurement.xml   |   2 +-
 data_model/master/clusters/EnergyCalendar.xml |   4 +-
 data_model/master/clusters/EnergyEVSE.xml     |  22 +-
 .../master/clusters/EnergyPreference.xml      |   2 +-
 data_model/master/clusters/EnergyPrice.xml    |   4 +-
 data_model/master/clusters/FanControl.xml     |   2 +-
 .../clusters/GeneralCommissioningCluster.xml  |   2 +-
 .../clusters/Group-Key-Management-Cluster.xml |   2 +-
 data_model/master/clusters/Groups.xml         |   2 +-
 data_model/master/clusters/Humidistat.xml     |   2 +-
 data_model/master/clusters/ICDManagement.xml  |  16 +-
 data_model/master/clusters/Identify.xml       |   2 +-
 .../clusters/JointFabricDatastoreCluster.xml  | 307 +++++++++++-------
 .../master/clusters/JointFabricPKICluster.xml |   2 +-
 data_model/master/clusters/KeypadInput.xml    |   2 +-
 .../Label-Cluster-FixedLabelCluster.xml       |   2 +-
 .../clusters/Label-Cluster-LabelCluster.xml   |   2 +-
 .../Label-Cluster-UserLabelCluster.xml        |   2 +-
 .../master/clusters/LaundryDryerControls.xml  |   2 +-
 .../master/clusters/LaundryWasherControls.xml |   2 +-
 data_model/master/clusters/LevelControl.xml   |   2 +-
 .../clusters/LocalizationConfiguration.xml    |   2 +-
 .../clusters/LocalizationTimeFormat.xml       |   2 +-
 .../master/clusters/LocalizationUnit.xml      |   2 +-
 data_model/master/clusters/LowPower.xml       |   2 +-
 data_model/master/clusters/MediaInput.xml     |   2 +-
 data_model/master/clusters/MediaPlayback.xml  |   2 +-
 data_model/master/clusters/Messages.xml       |   2 +-
 .../master/clusters/MicrowaveOvenControl.xml  |   2 +-
 data_model/master/clusters/ModeBase.xml       |   4 +-
 data_model/master/clusters/ModeSelect.xml     |   4 +-
 .../clusters/Mode_DeviceEnergyManagement.xml  |   2 +-
 .../master/clusters/Mode_Dishwasher.xml       |  11 +-
 data_model/master/clusters/Mode_EVSE.xml      |   2 +-
 .../master/clusters/Mode_LaundryWasher.xml    |  11 +-
 .../master/clusters/Mode_MicrowaveOven.xml    |   7 +-
 data_model/master/clusters/Mode_Oven.xml      |  21 +-
 data_model/master/clusters/Mode_RVCClean.xml  |   7 +-
 data_model/master/clusters/Mode_RVCRun.xml    |   7 +-
 .../master/clusters/Mode_Refrigerator.xml     |  11 +-
 .../master/clusters/Mode_WaterHeater.xml      |   2 +-
 .../clusters/NetworkCommissioningCluster.xml  |   2 +-
 .../clusters/NetworkIdentityManagement.xml    |   2 +-
 data_model/master/clusters/OTAProvider.xml    |   2 +-
 data_model/master/clusters/OTARequestor.xml   |   2 +-
 .../master/clusters/OccupancySensing.xml      |   2 +-
 data_model/master/clusters/OnOff.xml          |   2 +-
 .../clusters/OperationalCredentialCluster.xml |   2 +-
 .../master/clusters/OperationalState.xml      |   2 +-
 .../master/clusters/OperationalState_Oven.xml |  13 +-
 .../master/clusters/OperationalState_RVC.xml  |   2 +-
 .../master/clusters/PowerSourceCluster.xml    |  11 +-
 .../PowerSourceConfigurationCluster.xml       |   2 +-
 data_model/master/clusters/PowerTopology.xml  |   2 +-
 .../clusters/ProxyConfiguration-Cluster.xml   |   2 +-
 .../clusters/ProxyDiscovery-Cluster.xml       |   2 +-
 .../master/clusters/ResourceMonitoring.xml    |   2 +-
 data_model/master/clusters/ServiceArea.xml    | 143 ++++----
 data_model/master/clusters/SmokeCOAlarm.xml   |   2 +-
 data_model/master/clusters/Switch.xml         |   2 +-
 .../master/clusters/TargetNavigator.xml       |   2 +-
 .../master/clusters/TemperatureControl.xml    |   2 +-
 data_model/master/clusters/Thermostat.xml     |  75 ++---
 .../ThermostatUserInterfaceConfiguration.xml  |   2 +-
 .../clusters/ThreadBorderRouterManagement.xml |   8 +-
 .../clusters/ThreadNetworkDirectory.xml       |  32 +-
 data_model/master/clusters/TimeSync.xml       |   2 +-
 .../master/clusters/ValidProxies-Cluster.xml  |   2 +-
 .../clusters/ValveConfigurationControl.xml    |   2 +-
 data_model/master/clusters/WakeOnLAN.xml      |   2 +-
 .../master/clusters/WaterHeaterManagement.xml |   2 +-
 .../master/clusters/WiFiNetworkManagement.xml |  11 +-
 data_model/master/clusters/WindowCovering.xml |  14 +-
 .../bridge-clusters-ActionsCluster.xml        |   2 +-
 ...s-BridgedDeviceBasicInformationCluster.xml |  18 +-
 ...e-clusters-EcosystemInformationCluster.xml |  56 ++--
 data_model/master/device_types/Aggregator.xml |   2 +-
 .../master/device_types/AirPurifier.xml       |   2 +-
 .../master/device_types/AirQualitySensor.xml  |   2 +-
 .../master/device_types/BaseDeviceType.xml    |   2 +-
 .../master/device_types/BasicVideoPlayer.xml  |   2 +-
 .../master/device_types/BatteryStorage.xml    |   2 +-
 .../master/device_types/BridgedNode.xml       |   2 +-
 .../device_types/CastingVideoClient.xml       |   2 +-
 .../device_types/CastingVideoPlayer.xml       |   2 +-
 .../master/device_types/ColorDimmerSwitch.xml |   2 +-
 .../device_types/ColorTemperatureLight.xml    |   2 +-
 .../master/device_types/ContactSensor.xml     |   2 +-
 data_model/master/device_types/ContentApp.xml |   2 +-
 .../master/device_types/ControlBridge.xml     |   2 +-
 .../master/device_types/CookSurface.xml       |   2 +-
 data_model/master/device_types/Cooktop.xml    |   2 +-
 .../device_types/DeviceEnergyManagement.xml   |   2 +-
 .../master/device_types/DimmableLight.xml     |   2 +-
 .../device_types/DimmablePlug-InUnit.xml      |   2 +-
 .../master/device_types/DimmerSwitch.xml      |   2 +-
 data_model/master/device_types/Dishwasher.xml |   2 +-
 data_model/master/device_types/DoorLock.xml   |  39 ++-
 .../device_types/DoorLockController.xml       |   4 +-
 data_model/master/device_types/EVSE.xml       |   2 +-
 .../master/device_types/ElectricalSensor.xml  |   2 +-
 .../master/device_types/EnergyTariff.xml      |   2 +-
 .../device_types/EnergyTariffCalendar.xml     |   2 +-
 .../device_types/ExtendedColorLight.xml       |   2 +-
 .../master/device_types/ExtractorHood.xml     |   2 +-
 data_model/master/device_types/Fan.xml        |   2 +-
 data_model/master/device_types/FlowSensor.xml |   2 +-
 .../master/device_types/GenericSwitch.xml     |   2 +-
 data_model/master/device_types/HeatPump.xml   |   2 +-
 .../device_types/HumidifierDehumidifier.xml   |   2 +-
 .../master/device_types/HumiditySensor.xml    |   2 +-
 .../master/device_types/JointFabricAdmin.xml  |   2 +-
 .../master/device_types/LaundryDryer.xml      |   2 +-
 .../master/device_types/LaundryWasher.xml     |   2 +-
 .../master/device_types/LightSensor.xml       |   2 +-
 .../master/device_types/MicrowaveOven.xml     |   2 +-
 .../device_types/ModeSelectDeviceType.xml     |   2 +-
 .../MountedDimmableLoadControl.xml            | 124 +++++++
 .../device_types/MountedOnOffControl.xml      | 124 +++++++
 .../device_types/NetworkInfraManager.xml      |   2 +-
 .../master/device_types/OccupancySensor.xml   |   2 +-
 data_model/master/device_types/OnOffLight.xml |   2 +-
 .../master/device_types/OnOffLightSwitch.xml  |   2 +-
 .../master/device_types/OnOffPlug-inUnit.xml  |   2 +-
 .../master/device_types/OnOffSensor.xml       |   2 +-
 .../master/device_types/OtaProvider.xml       |   2 +-
 .../master/device_types/OtaRequestor.xml      |   2 +-
 data_model/master/device_types/Oven.xml       |   2 +-
 .../master/device_types/PowerSource.xml       |   2 +-
 .../master/device_types/PressureSensor.xml    |   2 +-
 data_model/master/device_types/Pump.xml       |   2 +-
 .../master/device_types/PumpController.xml    |   2 +-
 data_model/master/device_types/RainSensor.xml |   2 +-
 .../master/device_types/Refrigerator.xml      |   2 +-
 .../device_types/RoboticVacuumCleaner.xml     |   2 +-
 .../device_types/RoomAirConditioner.xml       |   2 +-
 .../device_types/RootNodeDeviceType.xml       |   2 +-
 .../SecondaryNetworkInterface.xml             |   2 +-
 .../master/device_types/SmokeCOAlarm.xml      |   2 +-
 data_model/master/device_types/SolarPower.xml |   2 +-
 data_model/master/device_types/Speaker.xml    |   2 +-
 .../TemperatureControlledCabinet.xml          |   2 +-
 .../master/device_types/TemperatureSensor.xml |   2 +-
 data_model/master/device_types/Thermostat.xml |  52 +--
 .../device_types/ThreadBorderRouter.xml       |   2 +-
 .../device_types/VideoRemoteControl.xml       |   2 +-
 .../device_types/WaterFreezeDetector.xml      |   2 +-
 .../master/device_types/WaterHeater.xml       |   2 +-
 .../master/device_types/WaterLeakDetector.xml |   2 +-
 data_model/master/device_types/WaterValve.xml |   2 +-
 .../master/device_types/WindowCovering.xml    |  11 +-
 .../device_types/WindowCoveringController.xml |  11 +-
 data_model/master/spec_sha                    |   2 +-
 docs/spec_clusters.md                         |  15 +-
 examples/lock-app/lock-common/lock-app.matter |   2 +-
 examples/lock-app/lock-common/lock-app.zap    |   2 +-
 src/python_testing/TC_DeviceConformance.py    |   7 +-
 src/python_testing/TestSpecParsingSupport.py  |  11 +-
 src/python_testing/spec_parsing_support.py    |   4 +-
 186 files changed, 1092 insertions(+), 878 deletions(-)
 create mode 100644 data_model/master/device_types/MountedDimmableLoadControl.xml
 create mode 100644 data_model/master/device_types/MountedOnOffControl.xml

diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
index ecfcb937e5b986..c4f48058b70416 100644
--- a/.github/.wordlist.txt
+++ b/.github/.wordlist.txt
@@ -650,6 +650,7 @@ href
 HSM
 hsm
 HTTPS
+Humidistat
 HW
 hwadr
 HydrogenConcentrationMeasurement
diff --git a/data_model/master/clusters/ACL-Cluster.xml b/data_model/master/clusters/ACL-Cluster.xml
index d5fbf419ba4daf..2278f7c7920ce4 100644
--- a/data_model/master/clusters/ACL-Cluster.xml
+++ b/data_model/master/clusters/ACL-Cluster.xml
@@ -57,15 +57,18 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001F" name="Access Control Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
-    <revision revision="2" summary="Added Managed feature"/>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Added Managed Device feature, Extension feature, fixed conformance"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x001F" name="AccessControl"/>
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="ACL" scope="Node"/>
   <features>
-    <feature bit="0" code="MNGD" name="Managed" summary="Device is managed">
+    <feature bit="0" code="EXTS" name="Extension" summary="Device provides ACL Extension attribute">
+      <optionalConform/>
+    </feature>
+    <feature bit="1" code="MNGD" name="Managed" summary="Device is managed">
       <optionalConform/>
     </feature>
   </features>
@@ -80,11 +83,6 @@ Davis, CA 95616, USA
       <item value="3" name="Group" summary="Group authenticated session">
         <mandatoryConform/>
       </item>
-      <item value="4" name="ALL" summary="All modes">
-        <mandatoryConform>
-          <feature name="MNGD"/>
-        </mandatoryConform>
-      </item>
     </enum>
     <enum name="AccessControlEntryPrivilegeEnum">
       <item value="1" name="View" summary="Can read and observe all (except Access Control Cluster and as seen by a non-Proxy)">
@@ -106,6 +104,20 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </item>
     </enum>
+    <enum name="AccessRestrictionTypeEnum">
+      <item value="0" name="AttributeAccessForbidden" summary="Clients on this fabric are currently forbidden from reading and writing an attribute">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="AttributeWriteForbidden" summary="Clients on this fabric are currently forbidden from writing an attribute">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="CommandForbidden" summary="Clients on this fabric are currently forbidden from invoking a command">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="EventForbidden" summary="Clients on this fabric are currently forbidden from reading an event">
+        <mandatoryConform/>
+      </item>
+    </enum>
     <enum name="ChangeTypeEnum">
       <item value="0" name="Changed" summary="Entry or extension was changed">
         <mandatoryConform/>
@@ -164,6 +176,45 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
     </struct>
+    <struct name="AccessRestrictionEntryStruct">
+      <field id="0" name="Endpoint" type="endpoint-no">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Cluster" type="cluster-id">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Restrictions" type="list" default="desc">
+        <entry type="AccessRestrictionStruct"/>
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
+        <constraint type="minCount" value="1"/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="AccessRestrictionStruct">
+      <field id="0" name="Type" type="AccessRestrictionTypeEnum">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ID" type="uint32">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+      </field>
+    </struct>
+    <struct name="CommissioningAccessRestrictionEntryStruct">
+      <field id="0" name="Endpoint" type="endpoint-no">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Cluster" type="cluster-id">
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="Restrictions" type="list" default="desc">
+        <entry type="AccessRestrictionStruct"/>
+        <mandatoryConform/>
+        <constraint type="minCount" value="1"/>
+      </field>
+    </struct>
   </dataTypes>
   <attributes>
     <attribute id="0x0000" name="ACL" type="list" default="desc">
@@ -175,7 +226,9 @@ Davis, CA 95616, USA
     <attribute id="0x0001" name="Extension" type="list" default="desc">
       <entry type="AccessControlExtensionStruct"/>
       <access read="true" write="true" readPrivilege="admin" writePrivilege="admin" fabricScoped="true"/>
-      <optionalConform/>
+      <mandatoryConform>
+        <feature name="EXTS"/>
+      </mandatoryConform>
       <constraint type="desc"/>
     </attribute>
     <attribute id="0x0002" name="SubjectsPerAccessControlEntry" type="uint16" default="4">
@@ -196,8 +249,17 @@ Davis, CA 95616, USA
       <mandatoryConform/>
       <constraint type="min" value="4"/>
     </attribute>
-    <attribute id="0x0005" name="ManagedACL" type="list" default="desc">
-      <entry type="AccessControlEntryStruct"/>
+    <attribute id="0x0005" name="CommissioningARL" type="list" default="[]">
+      <entry type="CommissioningAccessRestrictionEntryStruct"/>
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <constraint type="desc"/>
+    </attribute>
+    <attribute id="0x0006" name="ARL" type="list" default="[]">
+      <entry type="AccessRestrictionEntryStruct"/>
       <access read="true" readPrivilege="view" fabricScoped="true"/>
       <mandatoryConform>
         <feature name="MNGD"/>
@@ -205,6 +267,27 @@ Davis, CA 95616, USA
       <constraint type="desc"/>
     </attribute>
   </attributes>
+  <commands>
+    <command id="0x00" name="ReviewFabricRestrictions" direction="commandToServer" response="ReviewFabricRestrictionsResponse">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <field id="0" name="ARL" type="list" default="desc">
+        <entry type="AccessRestrictionStruct"/>
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x01" name="ReviewFabricRestrictionsResponse" direction="responseFromServer">
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <field id="0" name="Token" type="uint64">
+        <mandatoryConform/>
+      </field>
+    </command>
+  </commands>
   <events>
     <event id="0x00" name="AccessControlEntryChanged" priority="info">
       <access readPrivilege="admin" fabricSensitive="true"/>
@@ -229,7 +312,9 @@ Davis, CA 95616, USA
     </event>
     <event id="0x01" name="AccessControlExtensionChanged" priority="info">
       <access readPrivilege="admin" fabricSensitive="true"/>
-      <mandatoryConform/>
+      <mandatoryConform>
+        <feature name="EXTS"/>
+      </mandatoryConform>
       <field id="1" name="AdminNodeID" type="node-id">
         <quality nullable="true"/>
         <mandatoryConform/>
@@ -248,5 +333,30 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
     </event>
+    <event id="0x02" name="AccessRestrictionEntryChanged" priority="info">
+      <access readPrivilege="admin" fabricSensitive="true"/>
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+    </event>
+    <event id="0x03" name="FabricRestrictionReviewUpdate" priority="info">
+      <access readPrivilege="admin" fabricSensitive="true"/>
+      <mandatoryConform>
+        <feature name="MNGD"/>
+      </mandatoryConform>
+      <field id="0" name="Token" type="uint64">
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="Instruction" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="512"/>
+      </field>
+      <field id="2" name="RedirectURL" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="256"/>
+      </field>
+    </event>
   </events>
 </cluster>
\ No newline at end of file
diff --git a/data_model/master/clusters/AccountLogin.xml b/data_model/master/clusters/AccountLogin.xml
index 8a9ed7d9389f40..6205fb6cb73261 100644
--- a/data_model/master/clusters/AccountLogin.xml
+++ b/data_model/master/clusters/AccountLogin.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050E" name="Account Login Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add support for 8 character PIN code, Add Node to Login, Logout commands. Add LoggedOut event."/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/AdminCommissioningCluster.xml b/data_model/master/clusters/AdminCommissioningCluster.xml
index 8e95e46f128db0..77a8862b2eedc7 100644
--- a/data_model/master/clusters/AdminCommissioningCluster.xml
+++ b/data_model/master/clusters/AdminCommissioningCluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003C" name="Administrator Commissioning Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x003C" name="Administrator Commissioning"/>
diff --git a/data_model/master/clusters/AirQuality.xml b/data_model/master/clusters/AirQuality.xml
index c05717863c5ff4..69387d451a38c0 100644
--- a/data_model/master/clusters/AirQuality.xml
+++ b/data_model/master/clusters/AirQuality.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005B" name="Air Quality Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial version of the Air Quality cluster"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x005B" name="Air Quality"/>
diff --git a/data_model/master/clusters/ApplicationBasic.xml b/data_model/master/clusters/ApplicationBasic.xml
index 28e47e7800352e..93ffeeb958ad3a 100644
--- a/data_model/master/clusters/ApplicationBasic.xml
+++ b/data_model/master/clusters/ApplicationBasic.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050D" name="Application Basic Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x050D" name="Application Basic"/>
diff --git a/data_model/master/clusters/ApplicationLauncher.xml b/data_model/master/clusters/ApplicationLauncher.xml
index 27fa528a81e8cf..51fcde769007e9 100644
--- a/data_model/master/clusters/ApplicationLauncher.xml
+++ b/data_model/master/clusters/ApplicationLauncher.xml
@@ -57,9 +57,10 @@ Davis, CA 95616, USA
 
 :xrefstyle: basic
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050C" name="Application Launcher Cluster" revision="1">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050C" name="Application Launcher Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
+    <revision revision="2" summary="Addition of new states to StatusEnum"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x050C" name="Application Launcher"/>
@@ -75,10 +76,19 @@ Davis, CA 95616, USA
       <item value="0" name="Success" summary="Command succeeded">
         <mandatoryConform/>
       </item>
-      <item value="1" name="AppNotAvailable" summary="Requested app is not available.">
+      <item value="1" name="AppNotAvailable" summary="Requested app is not available">
         <mandatoryConform/>
       </item>
-      <item value="2" name="SystemBusy" summary="Video platform unable to honor command.">
+      <item value="2" name="SystemBusy" summary="Video platform unable to honor command">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="PendingUserApproval" summary="User approval for app download is pending">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Downloading" summary="Downloading the requested app">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="Installing" summary="Installing the requested app">
         <mandatoryConform/>
       </item>
     </enum>
diff --git a/data_model/master/clusters/AudioOutput.xml b/data_model/master/clusters/AudioOutput.xml
index 27bb5a20bb7952..9972a8a87e7a6f 100644
--- a/data_model/master/clusters/AudioOutput.xml
+++ b/data_model/master/clusters/AudioOutput.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050B" name="Audio Output Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x050B" name="Audio Output"/>
diff --git a/data_model/master/clusters/BasicInformationCluster.xml b/data_model/master/clusters/BasicInformationCluster.xml
index 538b4f5e9e9f8b..168a0353761159 100644
--- a/data_model/master/clusters/BasicInformationCluster.xml
+++ b/data_model/master/clusters/BasicInformationCluster.xml
@@ -57,20 +57,15 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0028" name="Basic Information Cluster" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added ProductAppearance attribute"/>
     <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
-    <revision revision="4" summary="Updated conformance for UniqueID to mandatory and add the BridgedICDSupport feature. Added DeviceLocation attribute."/>
+    <revision revision="4" summary="Updated conformance for UniqueID to mandatory. Added DeviceLocation attribute."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0028" name="Basic Information"/>
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="BINFO" scope="Node"/>
-  <features>
-    <feature bit="0" code="BIS" name="BridgedICDSupport" summary="A set of features that support Bridged ICD Devices.">
-      <optionalConform/>
-    </feature>
-  </features>
   <dataTypes>
     <enum name="ColorEnum">
       <item value="0" name="Black" summary="Approximately RGB #000000.">
@@ -308,23 +303,12 @@ Davis, CA 95616, USA
       <mandatoryConform/>
       <constraint type="min" value="1"/>
     </attribute>
-    <attribute id="0x0017" name="DeviceLocation" type="homeloc" default="MS">
+    <attribute id="0x0017" name="DeviceLocation" type="locationdesc" default="MS">
       <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <optionalConform/>
     </attribute>
   </attributes>
-  <commands>
-    <command id="0x00" name="KeepActive" direction="commandToServer" response="Y">
-      <access invokePrivilege="operate"/>
-      <mandatoryConform>
-        <feature name="BIS"/>
-      </mandatoryConform>
-      <field id="0" name="StayActiveDuration" type="uint32">
-        <mandatoryConform/>
-      </field>
-    </command>
-  </commands>
   <events>
     <event id="0x00" name="StartUp" priority="critical">
       <access readPrivilege="view"/>
@@ -351,15 +335,5 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
     </event>
-    <event id="0x04" name="ActiveChanged" priority="info">
-      <access readPrivilege="view"/>
-      <mandatoryConform>
-        <feature name="BIS"/>
-      </mandatoryConform>
-      <field id="0" name="PromisedActiveDuration" type="uint32">
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-    </event>
   </events>
 </cluster>
\ No newline at end of file
diff --git a/data_model/master/clusters/Binding-Cluster.xml b/data_model/master/clusters/Binding-Cluster.xml
index 055725f0b9ee47..72fc1eb6b3282d 100644
--- a/data_model/master/clusters/Binding-Cluster.xml
+++ b/data_model/master/clusters/Binding-Cluster.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001E" name="Binding Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x001E" name="Binding"/>
diff --git a/data_model/master/clusters/BooleanState.xml b/data_model/master/clusters/BooleanState.xml
index ddb16e26a1d6ad..9754a7af60b57a 100644
--- a/data_model/master/clusters/BooleanState.xml
+++ b/data_model/master/clusters/BooleanState.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0045" name="Boolean State Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0045" name="Boolean State"/>
diff --git a/data_model/master/clusters/BooleanStateConfiguration.xml b/data_model/master/clusters/BooleanStateConfiguration.xml
index 719cd9569b5ae2..d4ae791ad7649f 100644
--- a/data_model/master/clusters/BooleanStateConfiguration.xml
+++ b/data_model/master/clusters/BooleanStateConfiguration.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0080" name="Boolean State Configuration Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0080" name="Boolean State Configuration"/>
diff --git a/data_model/master/clusters/Channel.xml b/data_model/master/clusters/Channel.xml
index 6177bfe6a652cc..a2edf151cb6001 100644
--- a/data_model/master/clusters/Channel.xml
+++ b/data_model/master/clusters/Channel.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0504" name="Channel Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add EG and RP features, Identifier and Type to Channel Info for Over-the-Top (OTT) channel support."/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/CommissionerControlCluster.xml b/data_model/master/clusters/CommissionerControlCluster.xml
index eaaa3c51ec4a30..9cda8f414c89da 100644
--- a/data_model/master/clusters/CommissionerControlCluster.xml
+++ b/data_model/master/clusters/CommissionerControlCluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0751" name="Commissioner Control Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0751" name="Commissioner Control"/>
diff --git a/data_model/master/clusters/ContentAppObserver.xml b/data_model/master/clusters/ContentAppObserver.xml
index d6808baf982215..7ffe0b11d04377 100644
--- a/data_model/master/clusters/ContentAppObserver.xml
+++ b/data_model/master/clusters/ContentAppObserver.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0510" name="Content App Observer Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0510" name="Content App Observer"/>
diff --git a/data_model/master/clusters/ContentControl.xml b/data_model/master/clusters/ContentControl.xml
index 6848886c43ac02..6b72a298ebeead 100644
--- a/data_model/master/clusters/ContentControl.xml
+++ b/data_model/master/clusters/ContentControl.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050F" name="Content Control Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x050F" name="Content Control">
diff --git a/data_model/master/clusters/ContentLauncher.xml b/data_model/master/clusters/ContentLauncher.xml
index b4d6e7fa26500c..5470a14ce1da64 100644
--- a/data_model/master/clusters/ContentLauncher.xml
+++ b/data_model/master/clusters/ContentLauncher.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050A" name="Content Launcher Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add Seasons, Episode, Any and CurrentContext to search, Added Text/Audio tracks support with PlaybackPreferences field"/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/Descriptor-Cluster.xml b/data_model/master/clusters/Descriptor-Cluster.xml
index 9c0bcf0b2348e3..fabc3a2a16c658 100644
--- a/data_model/master/clusters/Descriptor-Cluster.xml
+++ b/data_model/master/clusters/Descriptor-Cluster.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x001D" name="Descriptor Cluster" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Semantic tag list; TagList feature"/>
     <revision revision="3" summary="Add EndpointUniqueID attribute"/>
   </revisionHistory>
diff --git a/data_model/master/clusters/DeviceEnergyManagement.xml b/data_model/master/clusters/DeviceEnergyManagement.xml
index efc027f27cdeee..cb7f46c008f5e1 100644
--- a/data_model/master/clusters/DeviceEnergyManagement.xml
+++ b/data_model/master/clusters/DeviceEnergyManagement.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0098" name="Device Energy Management Cluster" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Updates after 0.7 Ballot review"/>
     <revision revision="3" summary="Updates to match cluster spec updates"/>
     <revision revision="4" summary="Bug fixes found during PICS production"/>
diff --git a/data_model/master/clusters/DiagnosticLogsCluster.xml b/data_model/master/clusters/DiagnosticLogsCluster.xml
index 38520e81a85e16..9dc7f4c7ef448d 100644
--- a/data_model/master/clusters/DiagnosticLogsCluster.xml
+++ b/data_model/master/clusters/DiagnosticLogsCluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0032" name="Diagnostic Logs Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0032" name="Diagnostic Logs"/>
diff --git a/data_model/master/clusters/DiagnosticsEthernet.xml b/data_model/master/clusters/DiagnosticsEthernet.xml
index fd2bb0341ca06c..f000669f64156c 100644
--- a/data_model/master/clusters/DiagnosticsEthernet.xml
+++ b/data_model/master/clusters/DiagnosticsEthernet.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0037" name="Ethernet Network Diagnostics Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0037" name="Ethernet Network Diagnostics"/>
diff --git a/data_model/master/clusters/DiagnosticsGeneral.xml b/data_model/master/clusters/DiagnosticsGeneral.xml
index ff78100fe3a7d3..1266705ba6d0dc 100644
--- a/data_model/master/clusters/DiagnosticsGeneral.xml
+++ b/data_model/master/clusters/DiagnosticsGeneral.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0033" name="General Diagnostics Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="UpTime attribute now mandatory, and added TimeSnapshot command, added DMTEST feature."/>
   </revisionHistory>
   <clusterIds>
@@ -200,12 +200,12 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
       <field id="5" name="IPv4Addresses" type="list">
-        <entry type="ref_Ipv4Adr"/>
+        <entry type="ref_IPv4Address"/>
         <mandatoryConform/>
         <constraint type="maxCount" value="4"/>
       </field>
       <field id="6" name="IPv6Addresses" type="list">
-        <entry type="ref_Ipv6Adr"/>
+        <entry type="ref_IPv6Address"/>
         <mandatoryConform/>
         <constraint type="maxCount" value="8"/>
       </field>
diff --git a/data_model/master/clusters/DiagnosticsSoftware.xml b/data_model/master/clusters/DiagnosticsSoftware.xml
index c7ee8ee842bf02..55e865af040763 100644
--- a/data_model/master/clusters/DiagnosticsSoftware.xml
+++ b/data_model/master/clusters/DiagnosticsSoftware.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0034" name="Software Diagnostics Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0034" name="Software Diagnostics"/>
diff --git a/data_model/master/clusters/DiagnosticsThread.xml b/data_model/master/clusters/DiagnosticsThread.xml
index 1da3eba21a4e4e..a55412d7fd3eff 100644
--- a/data_model/master/clusters/DiagnosticsThread.xml
+++ b/data_model/master/clusters/DiagnosticsThread.xml
@@ -55,10 +55,11 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0035" name="Thread Network Diagnostics Cluster" revision="2">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0035" name="Thread Network Diagnostics Cluster" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Remove optionality from FrameErrorRate and MessageErrorRate"/>
+    <revision revision="3" summary="Add ExtAddress and Rloc16 attributes"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0035" name="Thread Network Diagnostics"/>
@@ -665,6 +666,16 @@ Davis, CA 95616, USA
       <mandatoryConform/>
       <constraint type="maxCount" value="4"/>
     </attribute>
+    <attribute id="0x003F" name="ExtAddress" type="uint64">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0040" name="Rloc16" type="uint16">
+      <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <mandatoryConform/>
+    </attribute>
   </attributes>
   <commands>
     <command id="0x00" name="ResetCounts" direction="commandToServer" response="Y">
diff --git a/data_model/master/clusters/DiagnosticsWiFi.xml b/data_model/master/clusters/DiagnosticsWiFi.xml
index 6ef28ee4cc09e0..87f7e44dc92b55 100644
--- a/data_model/master/clusters/DiagnosticsWiFi.xml
+++ b/data_model/master/clusters/DiagnosticsWiFi.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0036" name="Wi-Fi Network Diagnostics Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0036" name="Wi-Fi Network Diagnostics"/>
diff --git a/data_model/master/clusters/DoorLock.xml b/data_model/master/clusters/DoorLock.xml
index 138d40bdd544d6..46d659da94a690 100644
--- a/data_model/master/clusters/DoorLock.xml
+++ b/data_model/master/clusters/DoorLock.xml
@@ -116,9 +116,6 @@ Davis, CA 95616, USA
         </optionalConform>
       </otherwiseConform>
     </feature>
-    <feature bit="9" code="NOT" name="Notification" summary="Operation and Programming Notifications">
-      <optionalConform/>
-    </feature>
     <feature bit="10" code="YDSCH" name="YearDayAccessSchedules" summary="Lock supports year day user access schedules">
       <optionalConform/>
     </feature>
@@ -279,23 +276,6 @@ Davis, CA 95616, USA
         </optionalConform>
       </item>
     </enum>
-    <enum name="EventSourceEnum">
-      <item value="0" name="Keypad" summary="Event source is keypad">
-        <mandatoryConform/>
-      </item>
-      <item value="1" name="Remote" summary="Event source is remote">
-        <mandatoryConform/>
-      </item>
-      <item value="2" name="Manual" summary="Event source is manual">
-        <mandatoryConform/>
-      </item>
-      <item value="3" name="RFID" summary="Event source is RFID">
-        <mandatoryConform/>
-      </item>
-      <item value="255" name="Indeterminate" summary="Event source is unknown">
-        <mandatoryConform/>
-      </item>
-    </enum>
     <enum name="EventTypeEnum">
       <item value="0" name="Operation" summary="Event type is operation">
         <mandatoryConform/>
@@ -494,66 +474,6 @@ Davis, CA 95616, USA
         <optionalConform/>
       </item>
     </enum>
-    <enum name="OperationEventCodeEnum">
-      <item value="0" name="UnknownOrMfgSpecific" summary="Event code is unknown">
-        <optionalConform/>
-      </item>
-      <item value="1" name="Lock" summary="Event code is lock">
-        <optionalConform/>
-      </item>
-      <item value="2" name="Unlock" summary="Event code is unlock">
-        <optionalConform/>
-      </item>
-      <item value="3" name="LockFailureInvalidPINorRFID" summary="Event code is lock failure due to invalid PIN or RFID">
-        <optionalConform/>
-      </item>
-      <item value="4" name="LockFailureInvalidSchedule" summary="Event code is lock failure due to invalid schedule">
-        <optionalConform/>
-      </item>
-      <item value="5" name="UnlockFailureInvalidPINorRFID" summary="Event code is unlock failure due to invalid PIN or RFID">
-        <optionalConform/>
-      </item>
-      <item value="6" name="UnlockFailureInvalidSchedule" summary="Event code is unlock failure due to invalid schedule">
-        <optionalConform/>
-      </item>
-      <item value="7" name="OneTouchLock" summary="Event code is one touch lock">
-        <optionalConform/>
-      </item>
-      <item value="8" name="KeyLock" summary="Event code is key lock">
-        <optionalConform/>
-      </item>
-      <item value="9" name="KeyUnlock" summary="Event code is key unlock">
-        <optionalConform/>
-      </item>
-      <item value="10" name="AutoLock" summary="Event code is auto lock">
-        <optionalConform/>
-      </item>
-      <item value="11" name="ScheduleLock" summary="Event code is schedule lock">
-        <mandatoryConform>
-          <orTerm>
-            <feature name="WDSCH"/>
-            <feature name="YDSCH"/>
-          </orTerm>
-        </mandatoryConform>
-      </item>
-      <item value="12" name="ScheduleUnlock" summary="Event code is schedule unlock">
-        <mandatoryConform>
-          <orTerm>
-            <feature name="WDSCH"/>
-            <feature name="YDSCH"/>
-          </orTerm>
-        </mandatoryConform>
-      </item>
-      <item value="13" name="ManualLock" summary="Event code is manual lock (Key or Thumbturn)">
-        <optionalConform/>
-      </item>
-      <item value="14" name="ManualUnlock" summary="Event code is manual unlock (Key or Thumbturn)">
-        <optionalConform/>
-      </item>
-      <item value="15" name="NonAccessUserOperationEvent" summary="Event code is non access user operation">
-        <optionalConform/>
-      </item>
-    </enum>
     <enum name="OperationSourceEnum">
       <item value="0" name="Unspecified" summary="Lock/unlock operation came from unspecified source">
         <optionalConform/>
@@ -598,29 +518,6 @@ Davis, CA 95616, USA
         </mandatoryConform>
       </item>
     </enum>
-    <enum name="ProgrammingEventCodeEnum">
-      <item value="0" name="UnknownOrMfgSpecific" summary="Event code is unknown">
-        <optionalConform/>
-      </item>
-      <item value="1" name="ProgrammingCodeChanged" summary="Event code is code changed">
-        <optionalConform/>
-      </item>
-      <item value="2" name="PINCodeAdded" summary="Event code is PIN added">
-        <optionalConform/>
-      </item>
-      <item value="3" name="PINCodeCleared" summary="Event code is PIN cleared">
-        <optionalConform/>
-      </item>
-      <item value="4" name="PINCodeChanged" summary="Event code is PIN changed">
-        <optionalConform/>
-      </item>
-      <item value="5" name="RFIDCodeAdded" summary="Event code is RFID added">
-        <optionalConform/>
-      </item>
-      <item value="6" name="RFIDCodeCleared" summary="Event code is RFID cleared">
-        <optionalConform/>
-      </item>
-    </enum>
     <enum name="SoundVolumeEnum">
       <item value="0" name="Silent" summary="Silent Mode">
         <mandatoryConform/>
@@ -778,56 +675,6 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </bitfield>
     </bitmap>
-    <bitmap name="EventMaskBitmap">
-      <bitfield name="Bit0" bit="0" summary="State of bit 0">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit1" bit="1" summary="State of bit 1">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit2" bit="2" summary="State of bit 2">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit3" bit="3" summary="State of bit 3">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit4" bit="4" summary="State of bit 4">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit5" bit="5" summary="State of bit 5">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit6" bit="6" summary="State of bit 6">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit7" bit="7" summary="State of bit 7">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit8" bit="8" summary="State of bit 8">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit9" bit="9" summary="State of bit 9">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit10" bit="10" summary="State of bit 10">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit11" bit="11" summary="State of bit 11">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit12" bit="12" summary="State of bit 12">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit13" bit="13" summary="State of bit 13">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit14" bit="14" summary="State of bit 14">
-        <mandatoryConform/>
-      </bitfield>
-      <bitfield name="Bit15" bit="15" summary="State of bit 15">
-        <mandatoryConform/>
-      </bitfield>
-    </bitmap>
     <bitmap name="LocalProgrammingFeaturesBitmap">
       <bitfield name="AddUsersCredentialsSchedules" bit="0" summary="The state of the ability to add users, credentials or schedules on the device">
         <mandatoryConform/>
@@ -871,7 +718,7 @@ Davis, CA 95616, USA
   <attributes>
     <attribute id="0x0000" name="LockState" type="LockStateEnum">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="true" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform/>
       <constraint type="desc"/>
     </attribute>
@@ -1120,67 +967,6 @@ Davis, CA 95616, USA
       <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
       <optionalConform/>
     </attribute>
-    <attribute id="0x0041" name="KeypadOperationEventMask" type="EventMaskBitmap" default="0xFFFF">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform>
-        <andTerm>
-          <feature name="NOT"/>
-          <feature name="PIN"/>
-        </andTerm>
-      </optionalConform>
-    </attribute>
-    <attribute id="0x0042" name="RemoteOperationEventMask" type="EventMaskBitmap" default="0xFFFF">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform>
-        <feature name="NOT"/>
-      </optionalConform>
-    </attribute>
-    <attribute id="0x0043" name="ManualOperationEventMask" type="EventMaskBitmap" default="0xFFFF">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform>
-        <feature name="NOT"/>
-      </optionalConform>
-    </attribute>
-    <attribute id="0x0044" name="RFIDOperationEventMask" type="EventMaskBitmap" default="0xFFFF">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform>
-        <andTerm>
-          <feature name="NOT"/>
-          <feature name="RID"/>
-        </andTerm>
-      </optionalConform>
-    </attribute>
-    <attribute id="0x0045" name="KeypadProgrammingEventMask" type="EventMaskBitmap" default="0xFFFF">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform>
-        <andTerm>
-          <feature name="NOT"/>
-          <feature name="PIN"/>
-        </andTerm>
-      </optionalConform>
-    </attribute>
-    <attribute id="0x0046" name="RemoteProgrammingEventMask" type="EventMaskBitmap" default="0xFFFF">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform>
-        <feature name="NOT"/>
-      </optionalConform>
-    </attribute>
-    <attribute id="0x0047" name="RFIDProgrammingEventMask" type="EventMaskBitmap" default="0xFFFF">
-      <access read="true" write="true" readPrivilege="view" writePrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform>
-        <andTerm>
-          <feature name="NOT"/>
-          <feature name="RID"/>
-        </andTerm>
-      </optionalConform>
-    </attribute>
     <attribute id="0x0080" name="AliroReaderVerificationKey" type="octstr" default="null">
       <access read="true" readPrivilege="admin"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
@@ -1958,47 +1744,6 @@ Davis, CA 95616, USA
         <constraint type="allowed" value="0xFFFE"/>
       </field>
     </command>
-    <command id="0x20" name="OperatingEventNotification" direction="commandToClient">
-      <access invokePrivilege="operate"/>
-      <optionalConform>
-        <feature name="NOT"/>
-      </optionalConform>
-    </command>
-    <command id="0x21" name="ProgrammingEventNotification" direction="commandToClient">
-      <access invokePrivilege="operate"/>
-      <optionalConform>
-        <feature name="NOT"/>
-      </optionalConform>
-      <field id="0" name="ProgramEventSource" type="EventSourceEnum">
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-      <field id="1" name="ProgramEventCode" type="ProgrammingEventCodeEnum">
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-      <field id="2" name="UserID" type="uint16">
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-      <field id="3" name="PIN" type="octstr">
-        <mandatoryConform/>
-      </field>
-      <field id="4" name="UserType" type="UserTypeEnum">
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-      <field id="5" name="UserStatus" type="UserStatusEnum">
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-      <field id="6" name="LocalTime" type="epoch-s">
-        <mandatoryConform/>
-      </field>
-      <field id="7" name="Data" type="string">
-        <optionalConform/>
-      </field>
-    </command>
     <command id="0x22" name="SetCredential" direction="commandToServer" response="SetCredentialResponse">
       <access invokePrivilege="admin" timed="true"/>
       <mandatoryConform>
diff --git a/data_model/master/clusters/ElectricalEnergyMeasurement.xml b/data_model/master/clusters/ElectricalEnergyMeasurement.xml
index 77e05665b2d031..259f9f512aec02 100644
--- a/data_model/master/clusters/ElectricalEnergyMeasurement.xml
+++ b/data_model/master/clusters/ElectricalEnergyMeasurement.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0091" name="Electrical Energy Measurement Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0091" name="Electrical Energy Measurement"/>
diff --git a/data_model/master/clusters/ElectricalPowerMeasurement.xml b/data_model/master/clusters/ElectricalPowerMeasurement.xml
index ba9dd22f3fa799..5953d36b9d992e 100644
--- a/data_model/master/clusters/ElectricalPowerMeasurement.xml
+++ b/data_model/master/clusters/ElectricalPowerMeasurement.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0090" name="Electrical Power Measurement Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0090" name="Electrical Power Measurement"/>
diff --git a/data_model/master/clusters/EnergyCalendar.xml b/data_model/master/clusters/EnergyCalendar.xml
index 5e9b3b782a435c..5be0f8ff520aea 100644
--- a/data_model/master/clusters/EnergyCalendar.xml
+++ b/data_model/master/clusters/EnergyCalendar.xml
@@ -59,9 +59,9 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009A" name="Energy Calendar Cluster" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="mandatory global ClusterRevision attribute added; Added from SE1.4; CCB 2068"/>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; Added from SE1.4; CCB 2068"/>
     <revision revision="2" summary="CCB 3042"/>
-    <revision revision="3" summary="Initial Matter Release"/>
+    <revision revision="3" summary="Initial Matter revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x009A" name="Energy Calendar"/>
diff --git a/data_model/master/clusters/EnergyEVSE.xml b/data_model/master/clusters/EnergyEVSE.xml
index e481e06aa4e5d4..a4c865c3096a60 100644
--- a/data_model/master/clusters/EnergyEVSE.xml
+++ b/data_model/master/clusters/EnergyEVSE.xml
@@ -57,12 +57,11 @@ Davis, CA 95616, USA
 
 :xrefstyle: basic
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0099" name="Energy EVSE Cluster" revision="4">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0099" name="Energy EVSE Cluster" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Updates after 0.7 Ballot review"/>
-    <revision revision="3" summary="Added Q quality for SessionDuration, SessionEnergyCharged and SessionEnergyDischarged"/>
-    <revision revision="4" summary="Updates to V2X and associated areas"/>
+    <revision revision="3" summary="Added Q quality for SessionDuration, SessionEnergyCharged and SessionEnergyDischarged. Updates to V2X and associated areas. Make PREF mandatory."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0099" name="Energy EVSE"/>
@@ -76,16 +75,25 @@ Davis, CA 95616, USA
       </otherwiseConform>
     </feature>
     <feature bit="1" code="SOC" name="SoCReporting" summary="EVSE supports reporting of vehicle State of Charge (SoC)">
-      <provisionalConform/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
     </feature>
     <feature bit="2" code="PNC" name="PlugAndCharge" summary="EVSE supports PLC to support Plug and Charge">
-      <provisionalConform/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
     </feature>
     <feature bit="3" code="RFID" name="RFID" summary="EVSE is fitted with an RFID reader">
       <optionalConform/>
     </feature>
     <feature bit="4" code="V2X" name="V2X" summary="EVSE supports bi-directional charging / discharging">
-      <provisionalConform/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
     </feature>
   </features>
   <dataTypes>
diff --git a/data_model/master/clusters/EnergyPreference.xml b/data_model/master/clusters/EnergyPreference.xml
index cd2b722607a45b..2534ccfc8474c6 100644
--- a/data_model/master/clusters/EnergyPreference.xml
+++ b/data_model/master/clusters/EnergyPreference.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009B" name="Energy Preference Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x009B" name="Energy Preference">
diff --git a/data_model/master/clusters/EnergyPrice.xml b/data_model/master/clusters/EnergyPrice.xml
index a4efa28e1b0dbf..aae07641398eeb 100644
--- a/data_model/master/clusters/EnergyPrice.xml
+++ b/data_model/master/clusters/EnergyPrice.xml
@@ -59,10 +59,10 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0095" name="Energy Price Cluster" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="mandatory global ClusterRevision attribute added"/>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="Updated from SE1.4 version; CCB 1447 2964 2965"/>
     <revision revision="3" summary="CCBs 2043 2706 2810 2912 3566"/>
-    <revision revision="4" summary="Initial Matter Release"/>
+    <revision revision="4" summary="Initial Matter revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0095" name="Energy Price"/>
diff --git a/data_model/master/clusters/FanControl.xml b/data_model/master/clusters/FanControl.xml
index daae13aff910d4..9eba1df549981c 100644
--- a/data_model/master/clusters/FanControl.xml
+++ b/data_model/master/clusters/FanControl.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0202" name="Fan Control Cluster" revision="5">
   <revisionHistory>
-    <revision revision="1" summary="Global mandatory ClusterRevision attribute added"/>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="New data model format and notation; Percent, speed and motion settings; General cleanup"/>
     <revision revision="3" summary="Addition of AirflowDirection and Step command"/>
     <revision revision="4" summary="Change conformance for FanModeSequenceEnum"/>
diff --git a/data_model/master/clusters/GeneralCommissioningCluster.xml b/data_model/master/clusters/GeneralCommissioningCluster.xml
index ed10afa8406a5a..2d9e65848f0c85 100644
--- a/data_model/master/clusters/GeneralCommissioningCluster.xml
+++ b/data_model/master/clusters/GeneralCommissioningCluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0030" name="General Commissioning Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add Enhanced Setup Flow"/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/Group-Key-Management-Cluster.xml b/data_model/master/clusters/Group-Key-Management-Cluster.xml
index 35de0890bd87d3..784bdc903ec186 100644
--- a/data_model/master/clusters/Group-Key-Management-Cluster.xml
+++ b/data_model/master/clusters/Group-Key-Management-Cluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003F" name="Group Key Management Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Clarify KeySetWrite validation and behavior on invalid epoch key lengths"/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/Groups.xml b/data_model/master/clusters/Groups.xml
index 6c53c1a602f255..214e6c18280afa 100644
--- a/data_model/master/clusters/Groups.xml
+++ b/data_model/master/clusters/Groups.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0004" name="Groups Cluster" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="Global mandatory ClusterRevision attribute added; CCB 1745 2100"/>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 1745 2100"/>
     <revision revision="2" summary="CCB 2289"/>
     <revision revision="3" summary="CCB 2310 2704"/>
     <revision revision="4" summary="New data model format and notation"/>
diff --git a/data_model/master/clusters/Humidistat.xml b/data_model/master/clusters/Humidistat.xml
index c3aac1dab85a20..1af54698489d31 100644
--- a/data_model/master/clusters/Humidistat.xml
+++ b/data_model/master/clusters/Humidistat.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0205" name="Humidistat Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0205" name="Humidistat"/>
diff --git a/data_model/master/clusters/ICDManagement.xml b/data_model/master/clusters/ICDManagement.xml
index d4731fb545ad9a..830f62fba2a63f 100644
--- a/data_model/master/clusters/ICDManagement.xml
+++ b/data_model/master/clusters/ICDManagement.xml
@@ -57,10 +57,11 @@ Davis, CA 95616, USA
 
 // Update Name
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0046" name="ICD Management Cluster" revision="2">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0046" name="ICD Management Cluster" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Addition of LIT ICD support, UserActiveModeTrigger, ActiveModeDuration, StayActiveResponse; removal of field Key in MonitoringRegistrationStruct"/>
+    <revision revision="3" summary="Addition of the ClientType attribute; addition of the ICD Check-In Backoff support; addition of the DynamicSitLitSupport feature"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0046" name="ICDManagement"/>
@@ -91,6 +92,14 @@ Davis, CA 95616, USA
         <optionalConform/>
       </otherwiseConform>
     </feature>
+    <feature bit="3" code="DSLS" name="DynamicSitLitSupport" summary="Device supports dynamic switching from SIT to LIT operating modes.">
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform>
+          <feature name="LITS"/>
+        </optionalConform>
+      </otherwiseConform>
+    </feature>
   </features>
   <dataTypes>
     <number name="ClientType Field" type=""/>
@@ -217,6 +226,9 @@ Davis, CA 95616, USA
         <optionalConform/>
         <constraint type="maxLength" value="16"/>
       </field>
+      <field id="4" name="ClientType" type="ClientTypeEnum">
+        <mandatoryConform/>
+      </field>
     </command>
     <command id="0x01" name="RegisterClientResponse" direction="responseFromServer">
       <mandatoryConform>
diff --git a/data_model/master/clusters/Identify.xml b/data_model/master/clusters/Identify.xml
index 0ab68abb8b1635..a6682b7233d30a 100644
--- a/data_model/master/clusters/Identify.xml
+++ b/data_model/master/clusters/Identify.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0003" name="Identify Cluster" revision="5">
   <revisionHistory>
-    <revision revision="1" summary="Global mandatory ClusterRevision attribute added"/>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="CCB 2808"/>
     <revision revision="3" summary="All Hubs changes"/>
     <revision revision="4" summary="New data model format and notation; add IdentifyType"/>
diff --git a/data_model/master/clusters/JointFabricDatastoreCluster.xml b/data_model/master/clusters/JointFabricDatastoreCluster.xml
index 40e46ecc78519c..79143f34d03f55 100644
--- a/data_model/master/clusters/JointFabricDatastoreCluster.xml
+++ b/data_model/master/clusters/JointFabricDatastoreCluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Joint Fabric Datastore Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId name="Joint Fabric Datastore Cluster"/>
@@ -75,14 +75,33 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </item>
     </enum>
-    <struct name="Datastore Admin Information Entry">
+    <struct name="Datastore ACL Entry">
+      <field id="0" name="ListID" type="uint16">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="ACLEntry" type="ref_AccessControlEntryStruct">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="2" name="StatusEntry" type="DatastoreStatusEntry">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="Datastore Administrator Information Entry">
       <field id="1" name="NodeID" type="node-id">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="FriendlyName" type="string">
+        <access read="true"/>
         <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
       </field>
       <field id="3" name="VendorID" type="vendor-id">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="4" name="ICAC" type="octstr">
@@ -90,309 +109,376 @@ Davis, CA 95616, USA
         <mandatoryConform/>
         <constraint type="maxLength" value="400"/>
       </field>
+      <access fabricScoped="true"/>
     </struct>
     <struct name="Datastore Endpoint Entry">
-      <field id="0" name="EndpointID" type="uint64">
+      <field id="0" name="EndpointID" type="endpoint-id">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="NodeID" type="node-id">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="2" name="FriendlyName" type="string">
+        <access read="true"/>
         <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
       </field>
       <field id="3" name="StatusEntry" type="DatastoreStatusEntry">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="4" name="GroupIDList" type="DataTypeList[Datastore Group ID Entry Type]">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="5" name="BindingList" type="DataTypeList[Datastore Binding Entry Type]">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
+      <access fabricScoped="true"/>
     </struct>
-    <struct name="Datastore Epoch Key Entry">
-      <field id="0" name="GroupKeySet" type="ref_GroupKeySetStruct">
+    <struct name="Datastore Group ID Entry">
+      <field id="0" name="GroupID" type="group-id">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
-      <field id="1" name="UpdateTimestamp" type="utc" default="null">
+      <field id="1" name="StatusEntry" type="DatastoreStatusEntry">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
-      <field id="2" name="FriendlyName" type="string">
-        <optionalConform/>
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="Datastore Group Information Entry">
+      <field id="0" name="GroupID" type="uint64">
+        <access read="true"/>
+        <mandatoryConform/>
+      </field>
+      <field id="1" name="FriendlyName" type="string">
+        <access read="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
       </field>
-      <field id="3" name="ID" type="uint16">
+      <field id="2" name="GroupKeySetID" type="uint16">
+        <access read="true"/>
         <mandatoryConform/>
         <constraint type="between" from="1" to="65535"/>
       </field>
-    </struct>
-    <struct name="Datastore Group ID Entry">
-      <field id="0" name="GroupID" type="uint64">
+      <field id="3" name="GroupCAT" type="uint16">
+        <access read="true"/>
         <mandatoryConform/>
+        <constraint type="between" from="1" to="65535"/>
       </field>
-      <field id="1" name="GroupNameUpdateTimestamp" type="utc" default="null">
+      <field id="4" name="GroupCATVersion" type="uint16">
+        <access read="true"/>
         <mandatoryConform/>
+        <constraint type="between" from="1" to="65535"/>
       </field>
-      <field id="2" name="StatusEntry" type="DatastoreStatusEntry">
+      <field id="5" name="GroupPermission" type="ref_AccessControlEntryPrivilegeEnum">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
+      <access fabricScoped="true"/>
     </struct>
-    <struct name="Datastore Group Information Entry">
-      <field id="0" name="GroupID" type="uint64">
+    <struct name="Datastore Node Information Entry">
+      <field id="1" name="NodeID" type="node-id">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
-      <field id="1" name="FriendlyName" type="string">
+      <field id="2" name="FriendlyName" type="string">
+        <access read="true"/>
         <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
       </field>
-      <field id="2" name="FriendlyNameUpdateTimestamp" type="utc" default="null">
+      <field id="3" name="CommissioningStatusEntry" type="DatastoreStatusEntry">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
-      <field id="3" name="GroupKeySetID" type="uint16">
+      <field id="4" name="NodeKeySetList" type="DataTypeList[Datastore Node Key Entry Type]">
+        <access read="true"/>
         <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
       </field>
-      <field id="4" name="GroupKeySetUpdateTimestamp" type="utc" default="null">
+      <field id="5" name="ACLList" type="list">
+        <entry type="Datastore ACL Entry"/>
+        <access read="true"/>
         <mandatoryConform/>
       </field>
-      <field id="5" name="GroupCAT" type="uint16">
+      <field id="6" name="EndpointList" type="DataTypeList[Datastore Endpoint Entry Type]">
+        <access read="true"/>
         <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
       </field>
-      <field id="6" name="GroupCATVersion" type="uint16">
+      <access fabricScoped="true"/>
+    </struct>
+    <struct name="Datastore Node Key Entry">
+      <field id="0" name="GroupKeySetID" type="uint16">
+        <access read="true"/>
         <mandatoryConform/>
-        <constraint type="between" from="1" to="65535"/>
       </field>
-      <field id="7" name="GroupPermission" type="ref_AccessControlEntryPrivilegeEnum">
+      <field id="1" name="StatusEntry" type="DatastoreStatusEntry">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
+      <access fabricScoped="true"/>
     </struct>
     <struct name="DatastoreStatusEntry">
       <field id="0" name="State" type="DatastoreStateEnum" default="Pending">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
       <field id="1" name="UpdateTimestamp" type="utc" default="null">
+        <access read="true"/>
         <mandatoryConform/>
       </field>
+      <access fabricScoped="true"/>
     </struct>
   </dataTypes>
   <attributes>
     <attribute id="0x0000" name="AnchorRootCA" type="octstr">
+      <access read="true" readPrivilege="admin"/>
       <mandatoryConform/>
     </attribute>
     <attribute id="0x0001" name="AnchorNodeID" type="node-id">
+      <access read="true" readPrivilege="admin"/>
       <mandatoryConform/>
     </attribute>
     <attribute id="0x0002" name="AnchorVendorID" type="vendor-id">
+      <access read="true" readPrivilege="admin"/>
       <mandatoryConform/>
     </attribute>
     <attribute id="0x0003" name="FriendlyName" type="string">
+      <access read="true" readPrivilege="admin"/>
+      <mandatoryConform/>
+      <constraint type="maxLength" value="32"/>
+    </attribute>
+    <attribute id="0x0004" name="GroupKeySetList" type="DataTypeList[ref_GroupKeySetStruct]">
+      <access read="true" readPrivilege="admin"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0004" name="GroupList" type="DataTypeList[Datastore Group Information Entry Type]">
+    <attribute id="0x0005" name="GroupList" type="DataTypeList[Datastore Group Information Entry Type]">
+      <access read="true" readPrivilege="admin"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0007" name="NodeList" type="DataTypeList[Datastore Node Information Entry Type]">
+    <attribute id="0x0006" name="NodeList" type="DataTypeList[Datastore Node Information Entry Type]">
+      <access read="true" readPrivilege="admin"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0008" name="AdminList" type="DataTypeList[Datastore Admin Information Entry Type]">
+    <attribute id="0x0007" name="AdminList" type="DataTypeList[Datastore Administrator Information Entry Type]">
+      <access read="true" readPrivilege="admin"/>
       <mandatoryConform/>
     </attribute>
   </attributes>
   <commands>
-    <command id="0x00" name="AddNodeToFabric Command" direction="commandToServer" response="Y">
+    <command id="0x00" name="AddKeySet Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="NodeInformationEntry" type="Datastore Node Information Entry">
+      <field id="0" name="GroupKeySet" type="ref_GroupKeySetStruct">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x01" name="RemoveNodeFromFabric Command" direction="commandToServer" response="Y">
+    <command id="0x01" name="UpdateKeySet Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
+      <field id="0" name="GroupKeySet" type="ref_GroupKeySetStruct">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x02" name="AddNodeToGroup Command" direction="commandToServer" response="Y">
+    <command id="0x02" name="RemoveKeySet Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="EndpointID" type="endpoint-id">
-        <mandatoryConform/>
-      </field>
-      <field id="2" name="GroupID" type="group-id">
+      <field id="0" name="GroupKeySetID" type="uint16">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x03" name="RemoveNodeFromGroup Command" direction="commandToServer" response="Y">
+    <command id="0x03" name="AddGroup Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="NodeID" type="node-id">
+      <field id="0" name="GroupID" type="group-id">
         <mandatoryConform/>
       </field>
-      <field id="1" name="EndpointID" type="endpoint-id">
+      <field id="1" name="FriendlyName" type="string">
         <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
       </field>
-      <field id="2" name="GroupID" type="group-id">
+      <field id="2" name="GroupKeySetID" type="uint16">
         <mandatoryConform/>
+        <constraint type="between" from="1" to="65535"/>
       </field>
-    </command>
-    <command id="0x04" name="AddGroup Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="GroupInformationEntry" type="Datastore Group Information Entry">
+      <field id="3" name="GroupCAT" type="uint16">
         <mandatoryConform/>
+        <constraint type="between" from="1" to="65535"/>
       </field>
-    </command>
-    <command id="0x05" name="UpdateGroup Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="GroupInformationEntry" type="Datastore Group Information Entry">
+      <field id="4" name="GroupCATVersion" type="uint16">
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="65535"/>
+      </field>
+      <field id="5" name="GroupPermission" type="ref_AccessControlEntryPrivilegeEnum">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x06" name="RemoveGroup Command" direction="commandToServer" response="Y">
+    <command id="0x04" name="UpdateGroup Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
       <field id="0" name="GroupID" type="group-id">
         <mandatoryConform/>
       </field>
+      <field id="1" name="FriendlyName" type="string">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
+      </field>
+      <field id="2" name="GroupKeySetID" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="65535"/>
+      </field>
+      <field id="3" name="GroupCAT" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="65535"/>
+      </field>
+      <field id="4" name="GroupCATVersion" type="uint16">
+        <quality nullable="true"/>
+        <mandatoryConform/>
+        <constraint type="between" from="1" to="65535"/>
+      </field>
+      <field id="5" name="GroupPermission" type="ref_AccessControlEntryPrivilegeEnum">
+        <mandatoryConform/>
+        <constraint type="allowed" value="0bX"/>
+      </field>
     </command>
-    <command id="0x07" name="AddAdmin Command" direction="commandToServer" response="Y">
+    <command id="0x05" name="RemoveGroup Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="AdminInformationEntry" type="Datastore Admin Information Entry">
+      <field id="0" name="GroupID" type="group-id">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x08" name="UpdateAdmin Command" direction="commandToServer" response="Y">
+    <command id="0x06" name="AddAdmin Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="AdminInformationEntry" type="Datastore Admin Information Entry">
+      <field id="0" name="AdminInformationEntry" type="Datastore Administrator Information Entry">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x09" name="RemoveAdmin Command" direction="commandToServer" response="Y">
+    <command id="0x07" name="UpdateAdmin Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
       <field id="0" name="NodeID" type="node-id">
+        <quality nullable="true"/>
         <mandatoryConform/>
       </field>
-    </command>
-    <command id="0x0A" name="AddEndpointToNode Command" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="EndpointEntry" type="Datastore Endpoint Entry">
+      <field id="1" name="FriendlyName" type="string">
+        <quality nullable="true"/>
         <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
       </field>
-      <field id="1" name="NodeID" type="node-id">
+      <field id="2" name="ICAC" type="octstr">
+        <quality nullable="true"/>
         <mandatoryConform/>
+        <constraint type="maxLength" value="400"/>
       </field>
     </command>
-    <command id="0x0B" name="RemoveEndpointFromNode Command" direction="commandToServer" response="Y">
+    <command id="0x08" name="RemoveAdmin Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="EndpointID" type="endpoint-id">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="NodeID" type="node-id">
+      <field id="0" name="NodeID" type="node-id">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x0C" name="UpdateEndpointStateForNode Command" direction="commandToServer" response="Y">
+    <command id="0x09" name="AddPendingNode Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="EndpointID" type="endpoint-id">
+      <field id="0" name="NodeID" type="node-id">
         <mandatoryConform/>
       </field>
-      <field id="1" name="NodeID" type="node-id">
+      <field id="1" name="FriendlyName" type="string">
         <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
       </field>
-      <field id="2" name="State" type="DatastoreStatusEntry">
+    </command>
+    <command id="0x0A" name="RefreshNode Command" direction="commandToServer" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="NodeID" type="node-id">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x0D" name="AddACLToNode Command" direction="commandToServer" response="Y">
+    <command id="0x0B" name="UpdateNode Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
       <field id="0" name="NodeID" type="node-id">
         <mandatoryConform/>
       </field>
-      <field id="1" name="ACLEntry" type="Datastore ACL Entry">
+      <field id="1" name="FriendlyName" type="string">
         <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
       </field>
     </command>
-    <command id="0x0E" name="RemoveACLFromNode Command" direction="commandToServer" response="Y">
+    <command id="0x0C" name="RemoveNode Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="ACLID" type="uint16">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="NodeID" type="node-id">
+      <field id="0" name="NodeID" type="node-id">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x0F" name="UpdateACLStateForNode Command" direction="commandToServer" response="Y">
+    <command id="0x0D" name="UpdateEndpointForNode Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="ACLID" type="uint16">
+      <field id="0" name="EndpointID" type="endpoint-id">
         <mandatoryConform/>
       </field>
       <field id="1" name="NodeID" type="node-id">
         <mandatoryConform/>
       </field>
-      <field id="2" name="State" type="DatastoreStatusEntry">
+      <field id="2" name="FriendlyName" type="string">
         <mandatoryConform/>
+        <constraint type="maxLength" value="32"/>
       </field>
     </command>
-    <command id="0x10" name="AddGroupIDToEndpointForNode Command" direction="commandToServer" response="Y">
+    <command id="0x0E" name="AddGroupIDToEndpointForNode Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="GroupID" type="group-id">
+      <field id="0" name="NodeID" type="node-id">
         <mandatoryConform/>
       </field>
       <field id="1" name="EndpointID" type="endpoint-id">
         <mandatoryConform/>
       </field>
-      <field id="2" name="NodeID" type="node-id">
+      <field id="2" name="GroupID" type="group-id">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x11" name="RemoveGroupIDFromEndpointForNode Command" direction="commandToServer" response="Y">
+    <command id="0x0F" name="RemoveGroupIDFromEndpointForNode Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="GroupID" type="group-id">
+      <field id="0" name="NodeID" type="node-id">
         <mandatoryConform/>
       </field>
       <field id="1" name="EndpointID" type="endpoint-id">
         <mandatoryConform/>
       </field>
-      <field id="2" name="NodeID" type="node-id">
+      <field id="2" name="GroupID" type="group-id">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x12" name="UpdateGroupIDStateForEndpointForNode Command" direction="commandToServer" response="Y">
+    <command id="0x10" name="AddBindingToEndpointForNode Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="GroupID" type="group-id">
+      <field id="0" name="NodeID" type="node-id">
         <mandatoryConform/>
       </field>
       <field id="1" name="EndpointID" type="endpoint-id">
         <mandatoryConform/>
       </field>
-      <field id="2" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-      <field id="3" name="State" type="DatastoreStatusEntry">
+      <field id="2" name="Binding" type="ref_BindingTargetStruct">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x13" name="AddBindingToEndpointForNode Command" direction="commandToServer" response="Y">
+    <command id="0x11" name="RemoveBindingFromEndpointForNode Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="0" name="Binding" type="Datastore Binding Entry">
+      <field id="0" name="ListID" type="uint16">
         <mandatoryConform/>
       </field>
       <field id="1" name="EndpointID" type="endpoint-id">
@@ -402,32 +488,23 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x14" name="RemoveBindingFromEndpointForNode Command" direction="commandToServer" response="Y">
+    <command id="0x12" name="AddACLToNode Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="1" name="BindingID" type="uint16">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="EndpointID" type="endpoint-id">
+      <field id="0" name="NodeID" type="node-id">
         <mandatoryConform/>
       </field>
-      <field id="2" name="NodeID" type="node-id">
+      <field id="1" name="ACLEntry" type="ref_AccessControlEntryStruct">
         <mandatoryConform/>
       </field>
     </command>
-    <command id="0x15" name="UpdateBindingStateForEndpointAndNode Command" direction="commandToServer" response="Y">
+    <command id="0x13" name="RemoveACLFromNode Command" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" fabricScoped="true"/>
       <mandatoryConform/>
-      <field id="1" name="BindingID" type="uint16">
-        <mandatoryConform/>
-      </field>
-      <field id="1" name="EndpointID" type="endpoint-id">
+      <field id="0" name="ListID" type="uint16">
         <mandatoryConform/>
       </field>
-      <field id="2" name="NodeID" type="node-id">
-        <mandatoryConform/>
-      </field>
-      <field id="3" name="State" type="DatastoreStatusEntry">
+      <field id="1" name="NodeID" type="node-id">
         <mandatoryConform/>
       </field>
     </command>
diff --git a/data_model/master/clusters/JointFabricPKICluster.xml b/data_model/master/clusters/JointFabricPKICluster.xml
index 3519a11cec79c6..b8c9474b0163d8 100644
--- a/data_model/master/clusters/JointFabricPKICluster.xml
+++ b/data_model/master/clusters/JointFabricPKICluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Joint Fabric PKI Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId name="Joint Fabric PKI Cluster"/>
diff --git a/data_model/master/clusters/KeypadInput.xml b/data_model/master/clusters/KeypadInput.xml
index 57d6ef4650e013..efeb92ba28fb73 100644
--- a/data_model/master/clusters/KeypadInput.xml
+++ b/data_model/master/clusters/KeypadInput.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0509" name="Keypad Input Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0509" name="Keypad Input"/>
diff --git a/data_model/master/clusters/Label-Cluster-FixedLabelCluster.xml b/data_model/master/clusters/Label-Cluster-FixedLabelCluster.xml
index b915e77bb5a01f..a172d1e281eff5 100644
--- a/data_model/master/clusters/Label-Cluster-FixedLabelCluster.xml
+++ b/data_model/master/clusters/Label-Cluster-FixedLabelCluster.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0040" name="Fixed Label Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0040" name="Fixed Label"/>
diff --git a/data_model/master/clusters/Label-Cluster-LabelCluster.xml b/data_model/master/clusters/Label-Cluster-LabelCluster.xml
index 43148b6dc9186f..2f8a371f74042c 100644
--- a/data_model/master/clusters/Label-Cluster-LabelCluster.xml
+++ b/data_model/master/clusters/Label-Cluster-LabelCluster.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Label Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId name="Label"/>
diff --git a/data_model/master/clusters/Label-Cluster-UserLabelCluster.xml b/data_model/master/clusters/Label-Cluster-UserLabelCluster.xml
index 40dac53a4242cd..466550f12520f1 100644
--- a/data_model/master/clusters/Label-Cluster-UserLabelCluster.xml
+++ b/data_model/master/clusters/Label-Cluster-UserLabelCluster.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0041" name="User Label Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0041" name="User Label"/>
diff --git a/data_model/master/clusters/LaundryDryerControls.xml b/data_model/master/clusters/LaundryDryerControls.xml
index d860d2ef9dcf21..85f7871b267be5 100644
--- a/data_model/master/clusters/LaundryDryerControls.xml
+++ b/data_model/master/clusters/LaundryDryerControls.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x004A" name="Laundry Dryer Controls Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x004A" name="Laundry Dryer Controls"/>
diff --git a/data_model/master/clusters/LaundryWasherControls.xml b/data_model/master/clusters/LaundryWasherControls.xml
index 6fbfc0a882d3d1..046ecc3c51d697 100644
--- a/data_model/master/clusters/LaundryWasherControls.xml
+++ b/data_model/master/clusters/LaundryWasherControls.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0053" name="Laundry Washer Controls Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Updated Feature Map Conformance"/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/LevelControl.xml b/data_model/master/clusters/LevelControl.xml
index 5da823bc1dceb0..28f88b96832c32 100644
--- a/data_model/master/clusters/LevelControl.xml
+++ b/data_model/master/clusters/LevelControl.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0008" name="Level Control Cluster" revision="6">
   <revisionHistory>
-    <revision revision="1" summary="Global mandatory ClusterRevision attribute added"/>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="Added Options attribute, state change table; ZLO 1.0; Base cluster (no change)
              CCB 2085 1775 2281 2147"/>
     <revision revision="3" summary="CCB 2574 2616 2659 2702 2814 2818 2819 2898"/>
diff --git a/data_model/master/clusters/LocalizationConfiguration.xml b/data_model/master/clusters/LocalizationConfiguration.xml
index 7ddfba8efcc9cb..6bc3abd50600ab 100644
--- a/data_model/master/clusters/LocalizationConfiguration.xml
+++ b/data_model/master/clusters/LocalizationConfiguration.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002B" name="Localization Configuration Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x002B" name="Localization Configuration"/>
diff --git a/data_model/master/clusters/LocalizationTimeFormat.xml b/data_model/master/clusters/LocalizationTimeFormat.xml
index 2ede281c7352a9..2de3724879701d 100644
--- a/data_model/master/clusters/LocalizationTimeFormat.xml
+++ b/data_model/master/clusters/LocalizationTimeFormat.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002C" name="Time Format Localization Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x002C" name="Time Format Localization"/>
diff --git a/data_model/master/clusters/LocalizationUnit.xml b/data_model/master/clusters/LocalizationUnit.xml
index 0157ebb53b0d39..e08ce0e8810f26 100644
--- a/data_model/master/clusters/LocalizationUnit.xml
+++ b/data_model/master/clusters/LocalizationUnit.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002D" name="Unit Localization Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x002D" name="Unit Localization"/>
diff --git a/data_model/master/clusters/LowPower.xml b/data_model/master/clusters/LowPower.xml
index cf75cb0c680164..2e91a02c16a4b3 100644
--- a/data_model/master/clusters/LowPower.xml
+++ b/data_model/master/clusters/LowPower.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0508" name="Low Power Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0508" name="Low Power"/>
diff --git a/data_model/master/clusters/MediaInput.xml b/data_model/master/clusters/MediaInput.xml
index a92985ff924a75..c01567f6e1ae3e 100644
--- a/data_model/master/clusters/MediaInput.xml
+++ b/data_model/master/clusters/MediaInput.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0507" name="Media Input Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0507" name="Media Input"/>
diff --git a/data_model/master/clusters/MediaPlayback.xml b/data_model/master/clusters/MediaPlayback.xml
index dae60d7a1b2572..e37d5944aeb366 100644
--- a/data_model/master/clusters/MediaPlayback.xml
+++ b/data_model/master/clusters/MediaPlayback.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0506" name="Media Playback Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Text/Audio tracks support, Audio-while-advancing (AA) feature, StateChanged event"/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/Messages.xml b/data_model/master/clusters/Messages.xml
index 402310c4b92eea..d2dbd28ba87f81 100644
--- a/data_model/master/clusters/Messages.xml
+++ b/data_model/master/clusters/Messages.xml
@@ -98,7 +98,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0097" name="Messages Cluster" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="mandatory global ClusterRevision attribute added"/>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="Updated from SE1.4 version; CCB 1819"/>
     <revision revision="3" summary="Initial Matter release; renamed from EnergyMessaging to Messages"/>
   </revisionHistory>
diff --git a/data_model/master/clusters/MicrowaveOvenControl.xml b/data_model/master/clusters/MicrowaveOvenControl.xml
index 360b9edeaa55f1..2169f7b1437945 100644
--- a/data_model/master/clusters/MicrowaveOvenControl.xml
+++ b/data_model/master/clusters/MicrowaveOvenControl.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005F" name="Microwave Oven Control Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x005F" name="Microwave Oven Control"/>
diff --git a/data_model/master/clusters/ModeBase.xml b/data_model/master/clusters/ModeBase.xml
index 4a70ad670d0dca..c874eee69d3eb6 100644
--- a/data_model/master/clusters/ModeBase.xml
+++ b/data_model/master/clusters/ModeBase.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Mode Base Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial version"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status.
              Require at least one standard mode tag. Define reserved ranges for base/derived clusters"/>
   </revisionHistory>
@@ -105,7 +105,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0001" name="CurrentMode" type="uint8" default="MS">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform/>
       <constraint type="desc"/>
     </attribute>
diff --git a/data_model/master/clusters/ModeSelect.xml b/data_model/master/clusters/ModeSelect.xml
index 76ebf5874af273..6e6f062182e503 100644
--- a/data_model/master/clusters/ModeSelect.xml
+++ b/data_model/master/clusters/ModeSelect.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0050" name="Mode Select Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial version"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="The MfgCode field was marked non-nullable. Updated the related text. Reorder sections."/>
   </revisionHistory>
   <clusterIds>
@@ -116,7 +116,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0003" name="CurrentMode" type="uint8" default="MS">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform/>
       <constraint type="desc"/>
     </attribute>
diff --git a/data_model/master/clusters/Mode_DeviceEnergyManagement.xml b/data_model/master/clusters/Mode_DeviceEnergyManagement.xml
index 08c4044617d716..ff8f7e910e94b0 100644
--- a/data_model/master/clusters/Mode_DeviceEnergyManagement.xml
+++ b/data_model/master/clusters/Mode_DeviceEnergyManagement.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009F" name="Device Energy Management Mode Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x009F" name="Device Energy Management Mode">
diff --git a/data_model/master/clusters/Mode_Dishwasher.xml b/data_model/master/clusters/Mode_Dishwasher.xml
index 40a19828d44ebb..8069fdddcf0cc3 100644
--- a/data_model/master/clusters/Mode_Dishwasher.xml
+++ b/data_model/master/clusters/Mode_Dishwasher.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0059" name="Dishwasher Mode Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
   </revisionHistory>
   <clusterIds>
@@ -80,6 +80,11 @@ Davis, CA 95616, USA
       </field>
     </struct>
   </dataTypes>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster is disallowed for this cluster">
+      <disallowConform/>
+    </feature>
+  </features>
   <attributes>
     <attribute id="0x0000" name="SupportedModes">
       <mandatoryConform/>
@@ -88,10 +93,10 @@ Davis, CA 95616, USA
       <mandatoryConform/>
     </attribute>
     <attribute id="0x0002" name="StartUpMode">
-      <provisionalConform/>
+      <disallowConform/>
     </attribute>
     <attribute id="0x0003" name="OnMode">
-      <provisionalConform/>
+      <disallowConform/>
     </attribute>
   </attributes>
 </cluster>
\ No newline at end of file
diff --git a/data_model/master/clusters/Mode_EVSE.xml b/data_model/master/clusters/Mode_EVSE.xml
index f139ab3cbfaf9a..daf8042cc3293b 100644
--- a/data_model/master/clusters/Mode_EVSE.xml
+++ b/data_model/master/clusters/Mode_EVSE.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009D" name="Energy EVSE Mode Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x009D" name="Energy EVSE Mode"/>
diff --git a/data_model/master/clusters/Mode_LaundryWasher.xml b/data_model/master/clusters/Mode_LaundryWasher.xml
index 5d3cce891790e1..444d536fd178fd 100644
--- a/data_model/master/clusters/Mode_LaundryWasher.xml
+++ b/data_model/master/clusters/Mode_LaundryWasher.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0051" name="Laundry Washer Mode Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
   </revisionHistory>
   <clusterIds>
@@ -80,6 +80,11 @@ Davis, CA 95616, USA
       </field>
     </struct>
   </dataTypes>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster is disallowed for this cluster">
+      <disallowConform/>
+    </feature>
+  </features>
   <attributes>
     <attribute id="0x0000" name="SupportedModes">
       <mandatoryConform/>
@@ -88,10 +93,10 @@ Davis, CA 95616, USA
       <mandatoryConform/>
     </attribute>
     <attribute id="0x0002" name="StartUpMode">
-      <provisionalConform/>
+      <disallowConform/>
     </attribute>
     <attribute id="0x0003" name="OnMode">
-      <provisionalConform/>
+      <disallowConform/>
     </attribute>
   </attributes>
 </cluster>
\ No newline at end of file
diff --git a/data_model/master/clusters/Mode_MicrowaveOven.xml b/data_model/master/clusters/Mode_MicrowaveOven.xml
index 6f1e8ed895f489..b5076d8c270099 100644
--- a/data_model/master/clusters/Mode_MicrowaveOven.xml
+++ b/data_model/master/clusters/Mode_MicrowaveOven.xml
@@ -59,12 +59,17 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005E" name="Microwave Oven Mode Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x005E" name="Microwave Oven Mode"/>
   </clusterIds>
   <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="MWOM" scope="Endpoint"/>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster is disallowed for this cluster">
+      <disallowConform/>
+    </feature>
+  </features>
   <attributes>
     <attribute id="0x0000" name="SupportedModes">
       <mandatoryConform/>
diff --git a/data_model/master/clusters/Mode_Oven.xml b/data_model/master/clusters/Mode_Oven.xml
index bf6c1b57928a57..f7e8c8a4268cf2 100644
--- a/data_model/master/clusters/Mode_Oven.xml
+++ b/data_model/master/clusters/Mode_Oven.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0049" name="Oven Mode Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0049" name="Oven Mode"/>
@@ -79,4 +79,23 @@ Davis, CA 95616, USA
       </field>
     </struct>
   </dataTypes>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster is disallowed for this cluster">
+      <disallowConform/>
+    </feature>
+  </features>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <disallowConform/>
+    </attribute>
+  </attributes>
 </cluster>
\ No newline at end of file
diff --git a/data_model/master/clusters/Mode_RVCClean.xml b/data_model/master/clusters/Mode_RVCClean.xml
index b48ffa24a35b50..26b5d15c185fe3 100644
--- a/data_model/master/clusters/Mode_RVCClean.xml
+++ b/data_model/master/clusters/Mode_RVCClean.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0055" name="RVC Clean Mode Cluster" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add constraint about changing cleaning modes while the RVC Run Mode cluster is in a non-Idle mode. ChangeToModeResponse command: StatusText must be provided for InvalidInMode status. Deprecate the OnMode attribute and the related feature map bit."/>
     <revision revision="3" summary="Remove constraint on changing cleaning modes while the RVC Run Mode cluster is in a non-Idle mode. Continue to allow InvalidInMode response for devices that do not support such mode changes."/>
   </revisionHistory>
@@ -81,6 +81,11 @@ Davis, CA 95616, USA
       </field>
     </struct>
   </dataTypes>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster is disallowed for this cluster">
+      <disallowConform/>
+    </feature>
+  </features>
   <attributes>
     <attribute id="0x0000" name="SupportedModes">
       <mandatoryConform/>
diff --git a/data_model/master/clusters/Mode_RVCRun.xml b/data_model/master/clusters/Mode_RVCRun.xml
index ddfad8adc89d2e..ad0d7601a45c22 100644
--- a/data_model/master/clusters/Mode_RVCRun.xml
+++ b/data_model/master/clusters/Mode_RVCRun.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0054" name="RVC Run Mode Cluster" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add constraint about switching from non-Idle to non-Idle modes. ChangeToModeResponse command: StatusText must be provided for InvalidInMode status. Deprecate the OnMode attribute and the related feature map bit. Add the Mapping mode tag."/>
     <revision revision="3" summary="Remove constraint on changing cleaning modes while the RVC Run Mode cluster is in a non-Idle mode. Continue to allow InvalidInMode response for devices that do not support such mode changes."/>
   </revisionHistory>
@@ -81,6 +81,11 @@ Davis, CA 95616, USA
       </field>
     </struct>
   </dataTypes>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster is disallowed for this cluster">
+      <disallowConform/>
+    </feature>
+  </features>
   <attributes>
     <attribute id="0x0000" name="SupportedModes">
       <mandatoryConform/>
diff --git a/data_model/master/clusters/Mode_Refrigerator.xml b/data_model/master/clusters/Mode_Refrigerator.xml
index b4550283daf9e5..84410d1ddfc465 100644
--- a/data_model/master/clusters/Mode_Refrigerator.xml
+++ b/data_model/master/clusters/Mode_Refrigerator.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0052" name="Refrigerator And Temperature Controlled Cabinet Mode Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="ChangeToModeResponse command: StatusText must be provided for InvalidInMode status"/>
   </revisionHistory>
   <clusterIds>
@@ -80,6 +80,11 @@ Davis, CA 95616, USA
       </field>
     </struct>
   </dataTypes>
+  <features>
+    <feature bit="0" code="DEPONOFF" name="OnOff" summary="Dependency with the OnOff cluster is disallowed for this cluster">
+      <disallowConform/>
+    </feature>
+  </features>
   <attributes>
     <attribute id="0x0000" name="SupportedModes">
       <mandatoryConform/>
@@ -88,10 +93,10 @@ Davis, CA 95616, USA
       <mandatoryConform/>
     </attribute>
     <attribute id="0x0002" name="StartUpMode">
-      <provisionalConform/>
+      <disallowConform/>
     </attribute>
     <attribute id="0x0003" name="OnMode">
-      <provisionalConform/>
+      <disallowConform/>
     </attribute>
   </attributes>
 </cluster>
\ No newline at end of file
diff --git a/data_model/master/clusters/Mode_WaterHeater.xml b/data_model/master/clusters/Mode_WaterHeater.xml
index 482ea0e33d0f9a..1779e74bab8c84 100644
--- a/data_model/master/clusters/Mode_WaterHeater.xml
+++ b/data_model/master/clusters/Mode_WaterHeater.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009E" name="Water Heater Mode Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x009E" name="Water Heater Mode"/>
diff --git a/data_model/master/clusters/NetworkCommissioningCluster.xml b/data_model/master/clusters/NetworkCommissioningCluster.xml
index 63efd6c3d3cbb2..8eefb234a2920a 100644
--- a/data_model/master/clusters/NetworkCommissioningCluster.xml
+++ b/data_model/master/clusters/NetworkCommissioningCluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0031" name="Network Commissioning Cluster" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Support determining capabilities for Wi-Fi and Thread interfaces. Additional Wi-Fi directed scanning requirements."/>
     <revision revision="3" summary="Added support for Wi-Fi Per-Device Credentials (PDC feature; QueryIdentity and QueryIdentityResponse commands; PDC-related fields in commands)."/>
   </revisionHistory>
diff --git a/data_model/master/clusters/NetworkIdentityManagement.xml b/data_model/master/clusters/NetworkIdentityManagement.xml
index b432b8b68f6b23..cef2f88f6ddad9 100644
--- a/data_model/master/clusters/NetworkIdentityManagement.xml
+++ b/data_model/master/clusters/NetworkIdentityManagement.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0450" name="Network Identity Management Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0450" name="Network Identity Management"/>
diff --git a/data_model/master/clusters/OTAProvider.xml b/data_model/master/clusters/OTAProvider.xml
index 2a5be10961f02c..f300a419518675 100644
--- a/data_model/master/clusters/OTAProvider.xml
+++ b/data_model/master/clusters/OTAProvider.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0029" name="OTA Software Update Provider Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0029" name="OTA Software Update Provider"/>
diff --git a/data_model/master/clusters/OTARequestor.xml b/data_model/master/clusters/OTARequestor.xml
index 3a562c9f18a046..83314d14d9551a 100644
--- a/data_model/master/clusters/OTARequestor.xml
+++ b/data_model/master/clusters/OTARequestor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002A" name="OTA Software Update Requestor Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x002A" name="OTA Software Update Requestor"/>
diff --git a/data_model/master/clusters/OccupancySensing.xml b/data_model/master/clusters/OccupancySensing.xml
index 2852ce812f9308..4cd027deb07279 100644
--- a/data_model/master/clusters/OccupancySensing.xml
+++ b/data_model/master/clusters/OccupancySensing.xml
@@ -410,7 +410,7 @@ Davis, CA 95616, USA
     <event id="0x00" name="OccupancyChanged" priority="info">
       <access readPrivilege="view"/>
       <optionalConform/>
-      <field id="0" name="Occupancy" type="bool">
+      <field id="0" name="Occupancy" type="OccupancyBitmap">
         <mandatoryConform/>
       </field>
     </event>
diff --git a/data_model/master/clusters/OnOff.xml b/data_model/master/clusters/OnOff.xml
index b06c96a64376ac..b1ea6ebba4af7d 100644
--- a/data_model/master/clusters/OnOff.xml
+++ b/data_model/master/clusters/OnOff.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0006" name="On/Off Cluster" revision="6">
   <revisionHistory>
-    <revision revision="1" summary="Global mandatory ClusterRevision attribute added; CCB 1555"/>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 1555"/>
     <revision revision="2" summary="ZLO 1.0: StartUpOnOff"/>
     <revision revision="3" summary="FeatureMap global attribute support with Level Control and Lighting feature"/>
     <revision revision="4" summary="New data model format and notation"/>
diff --git a/data_model/master/clusters/OperationalCredentialCluster.xml b/data_model/master/clusters/OperationalCredentialCluster.xml
index b3811db4a5774a..338a8af007c5b9 100644
--- a/data_model/master/clusters/OperationalCredentialCluster.xml
+++ b/data_model/master/clusters/OperationalCredentialCluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Node Operational Credentials Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x003E" name="Operational Credentials"/>
diff --git a/data_model/master/clusters/OperationalState.xml b/data_model/master/clusters/OperationalState.xml
index 06c77fc29a2c19..354efa2400bda7 100644
--- a/data_model/master/clusters/OperationalState.xml
+++ b/data_model/master/clusters/OperationalState.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0060" name="Operational State Cluster" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="The Pause and Resume commands are usable in all compatible states. Define reserved ranges for base/derived clusters."/>
     <revision revision="3" summary="Changed CountdownTime attribute to Q quality."/>
   </revisionHistory>
diff --git a/data_model/master/clusters/OperationalState_Oven.xml b/data_model/master/clusters/OperationalState_Oven.xml
index fbcc634330faa7..710dea9806bf57 100644
--- a/data_model/master/clusters/OperationalState_Oven.xml
+++ b/data_model/master/clusters/OperationalState_Oven.xml
@@ -59,10 +59,21 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0048" name="Oven Cavity Operational State Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0048" name="Oven Cavity Operational State"/>
   </clusterIds>
   <classification hierarchy="derived" baseCluster="Operational State" role="application" picsCode="OVENOPSTATE" scope="Endpoint"/>
+  <commands>
+    <command id="0x00" name="Pause">
+      <disallowConform/>
+    </command>
+    <command id="0x01" name="Stop"/>
+    <command id="0x02" name="Start"/>
+    <command id="0x03" name="Resume">
+      <disallowConform/>
+    </command>
+    <command id="0x04" name="OperationalCommandResponse"/>
+  </commands>
 </cluster>
\ No newline at end of file
diff --git a/data_model/master/clusters/OperationalState_RVC.xml b/data_model/master/clusters/OperationalState_RVC.xml
index f33791fcf86407..5d2d28db2c2cad 100644
--- a/data_model/master/clusters/OperationalState_RVC.xml
+++ b/data_model/master/clusters/OperationalState_RVC.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0061" name="RVC Operational State Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="The Pause and Resume commands are usable in all compatible states. Deprecate the Start and Stop commands. Add the GoHome command."/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/PowerSourceCluster.xml b/data_model/master/clusters/PowerSourceCluster.xml
index 4596880e32b938..a0b6b91c565dd8 100644
--- a/data_model/master/clusters/PowerSourceCluster.xml
+++ b/data_model/master/clusters/PowerSourceCluster.xml
@@ -55,10 +55,11 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002F" name="Power Source Cluster" revision="2">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002F" name="Power Source Cluster" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added EndpointList attribute that maps a power source to a list of endpoints"/>
+    <revision revision="3" summary="Added Q quality (replacing C quality) on BatPercentRemaining, BatTimeRemaining and BatTimeToFullCharge"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x002F" name="Power Source"/>
@@ -631,7 +632,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x000C" name="BatPercentRemaining" type="uint8">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
       <optionalConform>
         <feature name="BAT"/>
       </optionalConform>
@@ -639,7 +640,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x000D" name="BatTimeRemaining" type="uint32">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
       <optionalConform>
         <feature name="BAT"/>
       </optionalConform>
@@ -744,7 +745,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x001B" name="BatTimeToFullCharge" type="uint32">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="true" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
       <optionalConform>
         <feature name="RECHG"/>
       </optionalConform>
diff --git a/data_model/master/clusters/PowerSourceConfigurationCluster.xml b/data_model/master/clusters/PowerSourceConfigurationCluster.xml
index 5348f6f0b091b6..61df60149ca00f 100644
--- a/data_model/master/clusters/PowerSourceConfigurationCluster.xml
+++ b/data_model/master/clusters/PowerSourceConfigurationCluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x002E" name="Power Source Configuration Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x002E" name="Power Source Configuration"/>
diff --git a/data_model/master/clusters/PowerTopology.xml b/data_model/master/clusters/PowerTopology.xml
index b958d03c01aeb1..eb0a2d74f5e585 100644
--- a/data_model/master/clusters/PowerTopology.xml
+++ b/data_model/master/clusters/PowerTopology.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009C" name="Power Topology Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x009C" name="Power Topology"/>
diff --git a/data_model/master/clusters/ProxyConfiguration-Cluster.xml b/data_model/master/clusters/ProxyConfiguration-Cluster.xml
index c33ed5cd03b841..6796e79ac9bf59 100644
--- a/data_model/master/clusters/ProxyConfiguration-Cluster.xml
+++ b/data_model/master/clusters/ProxyConfiguration-Cluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0042" name="Proxy Configuration Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0042" name="ProxyConfiguration">
diff --git a/data_model/master/clusters/ProxyDiscovery-Cluster.xml b/data_model/master/clusters/ProxyDiscovery-Cluster.xml
index 159bdff7333853..7353386929c109 100644
--- a/data_model/master/clusters/ProxyDiscovery-Cluster.xml
+++ b/data_model/master/clusters/ProxyDiscovery-Cluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0043" name="Proxy Discovery Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0043" name="ProxyDiscovery">
diff --git a/data_model/master/clusters/ResourceMonitoring.xml b/data_model/master/clusters/ResourceMonitoring.xml
index feb6394fd6b47d..b9d26ff6dd9ecf 100644
--- a/data_model/master/clusters/ResourceMonitoring.xml
+++ b/data_model/master/clusters/ResourceMonitoring.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Resource Monitoring Clusters" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial version of the Resource Monitoring cluster"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0071" name="HEPA Filter Monitoring" picsCode="HEPAFREMON"/>
diff --git a/data_model/master/clusters/ServiceArea.xml b/data_model/master/clusters/ServiceArea.xml
index 4980fc5ad40274..6a54264a94928b 100644
--- a/data_model/master/clusters/ServiceArea.xml
+++ b/data_model/master/clusters/ServiceArea.xml
@@ -57,95 +57,77 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0150" name="Service Area Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial version"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0150" name="Service Area"/>
   </clusterIds>
   <classification hierarchy="base" role="application" picsCode="SEAR" scope="Endpoint"/>
   <features>
-    <feature bit="0" code="LISTORDER" name="ListOrder" summary="The device operates at the selected locations in the list order">
+    <feature bit="0" code="SELRUN" name="SelectWhileRunning" summary="The device allows changing the selected areas while running">
       <optionalConform/>
     </feature>
-    <feature bit="1" code="SELRUN" name="SelectWhileRunning" summary="The device allows changing the selected locations while running">
+    <feature bit="1" code="PROG" name="ProgressReporting" summary="The device implements the progress reporting feature">
+      <optionalConform/>
+    </feature>
+    <feature bit="2" code="MAPS" name="Maps" summary="The device has map support">
       <optionalConform/>
     </feature>
   </features>
   <dataTypes>
     <enum name="OperationalStatusEnum">
-      <item value="0x00" name="Pending" summary="The device has not yet started operating, or has not finished but it is not currently operating, at the given location">
-        <mandatoryConform/>
-      </item>
-      <item value="0x01" name="Operating" summary="The device is currently operating at the given location">
-        <mandatoryConform/>
-      </item>
-      <item value="0x02" name="Skipped" summary="The device has skipped the given location, before or during operating at it">
-        <mandatoryConform/>
-      </item>
-      <item value="0x03" name="Completed" summary="The device has completed operating at the given location">
-        <mandatoryConform/>
-      </item>
-    </enum>
-    <enum name="SelectLocationsStatus">
-      <item value="0x00" name="Success" summary="Attempting to operate in the locations identified by the entries of the NewLocations field is allowed and possible. The SelectedLocations attribute is set to the value of the NewLocations field.">
-        <mandatoryConform/>
-      </item>
-      <item value="0x01" name="UnsupportedLocation" summary="The value of at least one of the entries of the NewLocations field doesn't match any entries in the SupportedLocations attribute.">
+      <item value="0x00" name="Pending" summary="The device has not yet started operating at the given area,
+                         or has not finished operating at that area but it is not currently
+                         operating at the area">
         <mandatoryConform/>
       </item>
-      <item value="0x02" name="DuplicatedLocations" summary="The NewLocations field contains at least two identical entries.">
+      <item value="0x01" name="Operating" summary="The device is currently operating at the given area">
         <mandatoryConform/>
       </item>
-      <item value="0x03" name="InvalidInMode" summary="The received request cannot be handled due to the current mode of the device.">
+      <item value="0x02" name="Skipped" summary="The device has skipped the given area, before or during operating at it,
+                         due to a SkipArea command, due an out of band command (e.g. from the vendor's application),
+                         due to a vendor specific reason, such as a time limit used by the device,
+                         or due the device ending operating unsuccessfully">
         <mandatoryConform/>
       </item>
-      <item value="0x04" name="InvalidSet" summary="The set of values is empty or invalid. For example, locations on different floors, that a robot knows it can't reach on its own.">
+      <item value="0x03" name="Completed" summary="The device has completed operating at the given area">
         <mandatoryConform/>
       </item>
     </enum>
-    <enum name="SkipCurrentLocationStatus">
-      <item value="0x00" name="Success" summary="Skipping to the next location is allowed and possible, or the device was operating at the last location and has stopped.">
-        <mandatoryConform/>
-      </item>
-      <item value="0x01" name="InvalidLocationList" summary="The SelectedLocations attribute is null.">
-        <mandatoryConform/>
-      </item>
-      <item value="0x02" name="InvalidInMode" summary="The received request cannot be handled due to the current mode of the device. For example, the CurrentLocation attribute is null.">
-        <mandatoryConform/>
-      </item>
-    </enum>
-    <struct name="LocationInfoStruct">
-      <field id="0" name="LocationInfo" type="homeloc">
+    <struct name="AreaInfoStruct">
+      <field id="0" name="LocationInfo" type="locationdesc">
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
-      <field id="1" name="LandmarkTag" type="tag">
+      <field id="1" name="LandmarkInfo" type="LandmarkInfoStruct">
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
-      <field id="2" name="PositionTag" type="tag">
-        <quality nullable="true"/>
+    </struct>
+    <struct name="AreaStruct">
+      <field id="0" name="AreaID" type="uint32" default="MS">
         <mandatoryConform/>
       </field>
-      <field id="3" name="SurfaceTag" type="tag">
+      <field id="1" name="MapID" type="uint32" default="MS">
         <quality nullable="true"/>
         <mandatoryConform/>
+        <constraint type="desc"/>
       </field>
-    </struct>
-    <struct name="LocationStruct">
-      <field id="0" name="LocationID" type="uint32" default="MS">
+      <field id="2" name="AreaDesc" type="AreaInfoStruct" default="MS">
         <mandatoryConform/>
       </field>
-      <field id="1" name="MapID" type="uint8" default="MS">
-        <quality nullable="true"/>
+    </struct>
+    <struct name="LandmarkInfoStruct">
+      <field id="0" name="LandmarkTag" type="tag">
         <mandatoryConform/>
       </field>
-      <field id="2" name="LocationInfo" type="LocationInfoStruct" default="MS">
+      <field id="1" name="PositionTag" type="tag">
+        <quality nullable="true"/>
         <mandatoryConform/>
       </field>
     </struct>
     <struct name="MapStruct">
-      <field id="0" name="MapID" type="uint8" default="MS">
+      <field id="0" name="MapID" type="uint32" default="MS">
         <mandatoryConform/>
       </field>
       <field id="1" name="Name" type="string" default="MS">
@@ -154,7 +136,7 @@ Davis, CA 95616, USA
       </field>
     </struct>
     <struct name="ProgressStruct">
-      <field id="0" name="LocationID" type="uint32" default="MS">
+      <field id="0" name="AreaID" type="uint32" default="MS">
         <mandatoryConform/>
       </field>
       <field id="1" name="Status" type="OperationalStatusEnum" default="MS">
@@ -164,92 +146,91 @@ Davis, CA 95616, USA
         <quality nullable="true"/>
         <optionalConform/>
       </field>
-      <field id="3" name="EstimatedTime" type="elapsed-s" default="MS">
+      <field id="3" name="InitialTimeEstimate" type="elapsed-s" default="MS">
         <quality nullable="true"/>
         <optionalConform/>
       </field>
     </struct>
   </dataTypes>
   <attributes>
-    <attribute id="0x0000" name="SupportedLocations" type="list" default="MS">
-      <entry type="LocationStruct"/>
+    <attribute id="0x0000" name="SupportedAreas" type="list" default="MS">
+      <entry type="AreaStruct"/>
       <access read="true" readPrivilege="view"/>
       <mandatoryConform/>
-      <constraint type="countBetween" from="1" to="255"/>
+      <constraint type="maxCount" value="255"/>
     </attribute>
     <attribute id="0x0001" name="SupportedMaps" type="list" default="MS">
       <entry type="MapStruct"/>
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <mandatoryConform/>
-      <constraint type="countBetween" from="1" to="255"/>
+      <mandatoryConform>
+        <feature name="MAPS"/>
+      </mandatoryConform>
+      <constraint type="maxCount" value="255"/>
     </attribute>
-    <attribute id="0x0002" name="SelectedLocations" type="list" default="null">
+    <attribute id="0x0002" name="SelectedAreas" type="list" default="empty">
       <entry type="uint32"/>
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform/>
       <constraint type="desc"/>
     </attribute>
-    <attribute id="0x0003" name="CurrentLocation" type="uint32" default="null">
+    <attribute id="0x0003" name="CurrentArea" type="uint32" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform/>
       <constraint type="desc"/>
     </attribute>
     <attribute id="0x0004" name="EstimatedEndTime" type="epoch-s" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
       <optionalConform>
-        <attribute name="CurrentLocation"/>
+        <attribute name="CurrentArea"/>
       </optionalConform>
     </attribute>
-    <attribute id="0x0005" name="Progress" type="list" default="null">
+    <attribute id="0x0005" name="Progress" type="list" default="empty">
       <entry type="ProgressStruct"/>
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform/>
-      <constraint type="countBetween" from="1" to="255"/>
+      <mandatoryConform>
+        <feature name="PROG"/>
+      </mandatoryConform>
+      <constraint type="maxCount" value="255"/>
     </attribute>
   </attributes>
   <commands>
-    <command id="0x00" name="SelectLocations" direction="commandToServer" response="SelectLocationsResponse">
+    <command id="0x00" name="SelectAreas" direction="commandToServer" response="SelectAreasResponse">
       <access invokePrivilege="operate"/>
       <mandatoryConform/>
-      <field id="0" name="NewLocations" type="list">
+      <field id="0" name="NewAreas" type="list">
         <entry type="uint32"/>
-        <quality nullable="true"/>
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
     </command>
-    <command id="0x01" name="SelectLocationsResponse" direction="responseFromServer">
-      <mandatoryConform>
-        <command name="SelectLocations"/>
-      </mandatoryConform>
-      <field id="0" name="Status" type="SelectLocationsStatus">
+    <command id="0x01" name="SelectAreasResponse" direction="responseFromServer">
+      <mandatoryConform/>
+      <field id="0" name="Status" type="SelectAreasStatus">
         <mandatoryConform/>
-        <constraint type="desc"/>
       </field>
       <field id="1" name="StatusText" type="string">
+        <mandatoryConform/>
         <constraint type="maxLength" value="256"/>
       </field>
     </command>
-    <command id="0x02" name="SkipCurrentLocation" direction="commandToServer" response="SkipCurrentLocationResponse">
+    <command id="0x02" name="SkipArea" direction="commandToServer" response="SkipAreaResponse">
       <access invokePrivilege="operate"/>
-      <optionalConform>
-        <attribute name="CurrentLocation"/>
-      </optionalConform>
+      <field id="0" name="SkippedArea" type="uint32">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
     </command>
-    <command id="0x03" name="SkipCurrentLocationResponse" direction="responseFromServer">
+    <command id="0x03" name="SkipAreaResponse" direction="responseFromServer">
       <mandatoryConform>
-        <command name="SkipCurrentLocation"/>
+        <command name="SkipArea"/>
       </mandatoryConform>
-      <field id="0" name="Status" type="SkipCurrentLocationStatus">
+      <field id="0" name="Status" type="SkipAreaStatus">
         <mandatoryConform/>
         <constraint type="desc"/>
       </field>
       <field id="1" name="StatusText" type="string">
+        <mandatoryConform/>
         <constraint type="maxLength" value="256"/>
       </field>
     </command>
diff --git a/data_model/master/clusters/SmokeCOAlarm.xml b/data_model/master/clusters/SmokeCOAlarm.xml
index 4ba9bd2708b476..482a8a82f2abf5 100644
--- a/data_model/master/clusters/SmokeCOAlarm.xml
+++ b/data_model/master/clusters/SmokeCOAlarm.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x005C" name="Smoke CO Alarm Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x005C" name="Smoke CO Alarm"/>
diff --git a/data_model/master/clusters/Switch.xml b/data_model/master/clusters/Switch.xml
index bb2066269b4f94..92489c1e9228a3 100644
--- a/data_model/master/clusters/Switch.xml
+++ b/data_model/master/clusters/Switch.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x003B" name="Switch Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Behavior clarifications for ambiguous combinations of events;
              Introduction of TotalNumberOfPressesCounted == 0 when MultiPressMax is exceeded;
              Introduction of ActionSwitch feature."/>
diff --git a/data_model/master/clusters/TargetNavigator.xml b/data_model/master/clusters/TargetNavigator.xml
index c5fb59919585c1..b1fcff6d60cd1e 100644
--- a/data_model/master/clusters/TargetNavigator.xml
+++ b/data_model/master/clusters/TargetNavigator.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0505" name="Target Navigator Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add TargetUpdated event"/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/TemperatureControl.xml b/data_model/master/clusters/TemperatureControl.xml
index 2f2527ce4ad0fa..79519716ea1cf8 100644
--- a/data_model/master/clusters/TemperatureControl.xml
+++ b/data_model/master/clusters/TemperatureControl.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0056" name="Temperature Control Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0056" name="Temperature Control"/>
diff --git a/data_model/master/clusters/Thermostat.xml b/data_model/master/clusters/Thermostat.xml
index 4374bc3f1c8a7d..de1743d8addf1a 100644
--- a/data_model/master/clusters/Thermostat.xml
+++ b/data_model/master/clusters/Thermostat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+Copyright (C) Connectivity Standards Alliance (2021-2024). All rights reserved.
 The information within this document is the property of the Connectivity
 Standards Alliance and its use and disclosure are restricted, except as
 expressly set forth herein.
@@ -55,7 +55,7 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0201" name="Thermostat Cluster" revision="8">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0201" name="Thermostat Cluster" revision="7">
   <revisionHistory>
     <revision revision="1" summary="Mandatory global ClusterRevision attribute added; fixed some defaults; CCB 1823, 1480"/>
     <revision revision="2" summary="CCB 1981 2186 2249 2250 2251; NFR Thermostat Setback"/>
@@ -63,8 +63,9 @@ Davis, CA 95616, USA
     <revision revision="4" summary="All Hubs changes"/>
     <revision revision="5" summary="New data model format and notation, added FeatureMap, collapsed attribute sets, clarified edge cases around limits, default value of xxxSetpointLimit now respects AbsxxxSetpointLimit"/>
     <revision revision="6" summary="Introduced the LTNE feature and adapted text (spec issue #5778)"/>
-    <revision revision="7" summary="Added Q quality for LocalTemperature, OutdoorTemperature and ACCoilTemperature, update constraints on local temperature calibration and minimum setpoint deadband"/>
-    <revision revision="8" summary="Introduced the Presets and Matter Schedules features"/>
+    <revision revision="7" summary="Added Q quality for LocalTemperature, OutdoorTemperature and ACCoilTemperature,
+             update constraints on local temperature calibration and minimum setpoint deadband and introduced
+             Presets and MatterScheduleConfiguration features"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0201" name="Thermostat"/>
@@ -396,10 +397,10 @@ Davis, CA 95616, USA
       </bitfield>
     </bitmap>
     <bitmap name="HVACSystemTypeBitmap">
-      <bitfield name="CoolingStage" from="0" to="1" summary="Stage of cooling the HVAC system is using.">
+      <bitfield name="CoolingStage" from="1" to="0" summary="Stage of cooling the HVAC system is using.">
         <mandatoryConform/>
       </bitfield>
-      <bitfield name="HeatingStage" from="2" to="3" summary="Stage of heating the HVAC system is using.">
+      <bitfield name="HeatingStage" from="3" to="2" summary="Stage of heating the HVAC system is using.">
         <mandatoryConform/>
       </bitfield>
       <bitfield name="HeatingIsHeatPump" bit="4" summary="Is the heating type Heat Pump.">
@@ -409,6 +410,11 @@ Davis, CA 95616, USA
         <mandatoryConform/>
       </bitfield>
     </bitmap>
+    <bitmap name="OccupancyBitmap">
+      <bitfield name="Occupied" bit="0" summary="Indicates the occupancy state">
+        <mandatoryConform/>
+      </bitfield>
+    </bitmap>
     <bitmap name="PresetTypeFeaturesBitmap">
       <bitfield name="Automatic" bit="0" summary="Preset may be automatically activated by the thermostat">
         <mandatoryConform/>
@@ -589,7 +595,7 @@ Davis, CA 95616, USA
       </field>
       <field id="1" name="TransitionTime" type="uint16">
         <mandatoryConform/>
-        <constraint type="between" from="0" to="1439"/>
+        <constraint type="max" value="1439"/>
       </field>
       <field id="2" name="PresetHandle" type="octstr">
         <optionalConform>
@@ -654,12 +660,11 @@ Davis, CA 95616, USA
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="true"/>
       <optionalConform/>
     </attribute>
-    <attribute id="0x0002" name="Occupancy" type="ref_OccupancyBitmap" default="1">
+    <attribute id="0x0002" name="Occupancy" type="OccupancyBitmap" default="1">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <feature name="OCC"/>
       </mandatoryConform>
-      <constraint type="desc"/>
     </attribute>
     <attribute id="0x0003" name="AbsMinHeatSetpointLimit" type="temperature" default="7°C">
       <access read="true" readPrivilege="view"/>
@@ -726,7 +731,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0011" name="OccupiedCoolingSetpoint" type="temperature" default="26°C">
       <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
-      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform>
         <feature name="COOL"/>
       </mandatoryConform>
@@ -734,7 +739,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0012" name="OccupiedHeatingSetpoint" type="temperature" default="20°C">
       <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
-      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform>
         <feature name="HEAT"/>
       </mandatoryConform>
@@ -816,7 +821,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x001C" name="SystemMode" type="SystemModeEnum" default="1">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
-      <quality changeOmitted="false" nullable="false" scene="true" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform/>
       <constraint type="desc"/>
     </attribute>
@@ -1047,7 +1052,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x004E" name="ActivePresetHandle" type="octstr" default="null">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="true" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform>
         <feature name="PRES"/>
       </mandatoryConform>
@@ -1055,7 +1060,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x004F" name="ActiveScheduleHandle" type="octstr" default="null">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="true" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform>
         <feature name="MSCH"/>
       </mandatoryConform>
@@ -1079,16 +1084,7 @@ Davis, CA 95616, USA
       </mandatoryConform>
       <constraint type="desc"/>
     </attribute>
-    <attribute id="0x0052" name="PresetsSchedulesEditable" type="bool" default="false">
-      <access read="true" readPrivilege="view"/>
-      <mandatoryConform>
-        <orTerm>
-          <feature name="MSCH"/>
-          <feature name="PRES"/>
-        </orTerm>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0053" name="SetpointHoldExpiryTimestamp" type="epoch-s" default="null">
+    <attribute id="0x0052" name="SetpointHoldExpiryTimestamp" type="epoch-s" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <optionalConform/>
@@ -1223,36 +1219,5 @@ Davis, CA 95616, USA
         <constraint type="maxLength" value="16"/>
       </field>
     </command>
-    <command id="0x07" name="StartPresetsSchedulesEditRequest" direction="commandToServer" response="Y">
-      <access invokePrivilege="manage"/>
-      <mandatoryConform>
-        <orTerm>
-          <feature name="MSCH"/>
-          <feature name="PRES"/>
-        </orTerm>
-      </mandatoryConform>
-      <field id="0" name="TimeoutSeconds" type="uint16">
-        <mandatoryConform/>
-        <constraint type="max" value="120"/>
-      </field>
-    </command>
-    <command id="0x08" name="CancelPresetsSchedulesEditRequest" direction="commandToServer" response="Y">
-      <access invokePrivilege="manage"/>
-      <mandatoryConform>
-        <orTerm>
-          <feature name="MSCH"/>
-          <feature name="PRES"/>
-        </orTerm>
-      </mandatoryConform>
-    </command>
-    <command id="0x09" name="CommitPresetsSchedulesRequest" direction="commandToServer" response="Y">
-      <access invokePrivilege="manage"/>
-      <mandatoryConform>
-        <orTerm>
-          <feature name="MSCH"/>
-          <feature name="PRES"/>
-        </orTerm>
-      </mandatoryConform>
-    </command>
   </commands>
 </cluster>
\ No newline at end of file
diff --git a/data_model/master/clusters/ThermostatUserInterfaceConfiguration.xml b/data_model/master/clusters/ThermostatUserInterfaceConfiguration.xml
index b4ecd49f93ae4a..d6a52248282321 100644
--- a/data_model/master/clusters/ThermostatUserInterfaceConfiguration.xml
+++ b/data_model/master/clusters/ThermostatUserInterfaceConfiguration.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0204" name="Thermostat User Interface Configuration Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Global mandatory ClusterRevision attribute added"/>
+    <revision revision="1" summary="Mandatory global ClusterRevision attribute added"/>
     <revision revision="2" summary="New data model format and notation, added &quot;Conversion of Temperature Values for Display&quot; section"/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/ThreadBorderRouterManagement.xml b/data_model/master/clusters/ThreadBorderRouterManagement.xml
index b22d4038219647..7ae4edab62f8b3 100644
--- a/data_model/master/clusters/ThreadBorderRouterManagement.xml
+++ b/data_model/master/clusters/ThreadBorderRouterManagement.xml
@@ -59,12 +59,12 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0452" name="Thread Border Router Management Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0452" name="Thread Border Router Management"/>
   </clusterIds>
-  <classification hierarchy="base" role="utility" picsCode="TBRM" scope="Node"/>
+  <classification hierarchy="base" role="application" picsCode="TBRM" scope="Endpoint"/>
   <features>
     <feature bit="0" code="PC" name="PANChange" summary="The ability to change PAN configuration with pending dataset setting request.">
       <optionalConform/>
@@ -119,7 +119,7 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x03" name="SetActiveDatasetRequest" direction="commandToServer" response="Y">
-      <access invokePrivilege="manage"/>
+      <access invokePrivilege="manage" timed="true"/>
       <mandatoryConform/>
       <field id="0" name="ActiveDataset" type="octstr">
         <mandatoryConform/>
@@ -130,7 +130,7 @@ Davis, CA 95616, USA
       </field>
     </command>
     <command id="0x04" name="SetPendingDatasetRequest" direction="commandToServer" response="Y">
-      <access invokePrivilege="manage"/>
+      <access invokePrivilege="manage" timed="true"/>
       <mandatoryConform>
         <feature name="PC"/>
       </mandatoryConform>
diff --git a/data_model/master/clusters/ThreadNetworkDirectory.xml b/data_model/master/clusters/ThreadNetworkDirectory.xml
index aeabdcf19f93d1..098b490fa5d369 100644
--- a/data_model/master/clusters/ThreadNetworkDirectory.xml
+++ b/data_model/master/clusters/ThreadNetworkDirectory.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0453" name="Thread Network Directory Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0453" name="Thread Network Directory"/>
@@ -67,8 +67,9 @@ Davis, CA 95616, USA
   <classification hierarchy="base" role="application" picsCode="THNETDIR" scope="Endpoint"/>
   <dataTypes>
     <struct name="ThreadNetworkStruct">
-      <field id="0" name="ExtendedPanID" type="uint64">
+      <field id="0" name="ExtendedPanID" type="octstr">
         <mandatoryConform/>
+        <constraint type="maxLength" value="8"/>
       </field>
       <field id="1" name="NetworkName" type="string">
         <mandatoryConform/>
@@ -77,17 +78,21 @@ Davis, CA 95616, USA
       <field id="2" name="Channel" type="uint16">
         <mandatoryConform/>
       </field>
+      <field id="3" name="ActiveTimestamp" type="uint64">
+        <mandatoryConform/>
+      </field>
     </struct>
   </dataTypes>
   <attributes>
-    <attribute id="0x0000" name="PreferredExtendedPanID" type="uint64" default="null">
-      <access read="true" write="true" readPrivilege="manage" writePrivilege="manage"/>
+    <attribute id="0x0000" name="PreferredExtendedPanID" type="octstr" default="null">
+      <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform/>
+      <constraint type="maxLength" value="8"/>
     </attribute>
     <attribute id="0x0001" name="ThreadNetworks" type="list">
       <entry type="ThreadNetworkStruct"/>
-      <access read="true" readPrivilege="operate"/>
+      <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform/>
       <constraint type="maxCount" value="ThreadNetworkTableSize"/>
@@ -111,15 +116,17 @@ Davis, CA 95616, USA
     <command id="0x01" name="RemoveNetwork" direction="commandToServer" response="Y">
       <access invokePrivilege="manage" timed="true"/>
       <mandatoryConform/>
-      <field id="0" name="ExtendedPanID" type="uint64">
+      <field id="0" name="ExtendedPanID" type="octstr">
         <mandatoryConform/>
+        <constraint type="maxLength" value="8"/>
       </field>
     </command>
     <command id="0x02" name="GetOperationalDataset" direction="commandToServer" response="OperationalDatasetResponse">
-      <access invokePrivilege="operate" timed="true"/>
+      <access invokePrivilege="manage"/>
       <mandatoryConform/>
-      <field id="0" name="ExtendedPanID" type="uint64">
+      <field id="0" name="ExtendedPanID" type="octstr">
         <mandatoryConform/>
+        <constraint type="maxLength" value="8"/>
       </field>
     </command>
     <command id="0x03" name="OperationalDatasetResponse" direction="responseFromServer">
@@ -130,13 +137,4 @@ Davis, CA 95616, USA
       </field>
     </command>
   </commands>
-  <events>
-    <event id="0x00" name="NetworkChanged" priority="info">
-      <access readPrivilege="operate"/>
-      <mandatoryConform/>
-      <field id="0" name="ExtendedPanID" type="uint64">
-        <mandatoryConform/>
-      </field>
-    </event>
-  </events>
 </cluster>
\ No newline at end of file
diff --git a/data_model/master/clusters/TimeSync.xml b/data_model/master/clusters/TimeSync.xml
index a506a647aeb8a3..e72a9d32467983 100644
--- a/data_model/master/clusters/TimeSync.xml
+++ b/data_model/master/clusters/TimeSync.xml
@@ -60,7 +60,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0038" name="Time Synchronization Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Make TrustedTimeSource fabric-aware, add TSC feature, define list max sizes, change writable attributes to commands, remote port, add attribute for DNS support"/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/ValidProxies-Cluster.xml b/data_model/master/clusters/ValidProxies-Cluster.xml
index c5740c90e52433..51cfeedb46926d 100644
--- a/data_model/master/clusters/ValidProxies-Cluster.xml
+++ b/data_model/master/clusters/ValidProxies-Cluster.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0044" name="Valid Proxies Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0044" name="ValidProxies">
diff --git a/data_model/master/clusters/ValveConfigurationControl.xml b/data_model/master/clusters/ValveConfigurationControl.xml
index 736672bc78f716..03d40acd480ff4 100644
--- a/data_model/master/clusters/ValveConfigurationControl.xml
+++ b/data_model/master/clusters/ValveConfigurationControl.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0081" name="Valve Configuration and Control Cluster" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Q quality for CurrentLevel"/>
   </revisionHistory>
   <clusterIds>
diff --git a/data_model/master/clusters/WakeOnLAN.xml b/data_model/master/clusters/WakeOnLAN.xml
index 7f5c08bdd624ad..092e0a8ea8f4de 100644
--- a/data_model/master/clusters/WakeOnLAN.xml
+++ b/data_model/master/clusters/WakeOnLAN.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0503" name="Wake On LAN Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0503" name="Wake on LAN"/>
diff --git a/data_model/master/clusters/WaterHeaterManagement.xml b/data_model/master/clusters/WaterHeaterManagement.xml
index ee38a0058b50fb..cadf8e0a8af53b 100644
--- a/data_model/master/clusters/WaterHeaterManagement.xml
+++ b/data_model/master/clusters/WaterHeaterManagement.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0094" name="Water Heater Management Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release in Matter"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0094" name="Water Heater Management"/>
diff --git a/data_model/master/clusters/WiFiNetworkManagement.xml b/data_model/master/clusters/WiFiNetworkManagement.xml
index cfa10af25f0dd6..3aad5935d2843d 100644
--- a/data_model/master/clusters/WiFiNetworkManagement.xml
+++ b/data_model/master/clusters/WiFiNetworkManagement.xml
@@ -59,23 +59,28 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0451" name="Wi-Fi Network Management Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0451" name="Wi-Fi Network Management"/>
   </clusterIds>
   <classification hierarchy="base" role="application" picsCode="WIFINM" scope="Endpoint"/>
   <attributes>
-    <attribute id="0x0001" name="SSID" type="octstr" default="null">
+    <attribute id="0x0000" name="SSID" type="octstr" default="null">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform/>
       <constraint type="lengthBetween" from="1" to="32"/>
     </attribute>
+    <attribute id="0x0001" name="PassphraseSurrogate" type="uint64" default="null">
+      <access read="true" readPrivilege="manage"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <mandatoryConform/>
+    </attribute>
   </attributes>
   <commands>
     <command id="0x00" name="NetworkPassphraseRequest" direction="commandToServer" response="NetworkPassphraseResponse">
-      <access invokePrivilege="admin"/>
+      <access invokePrivilege="manage"/>
       <mandatoryConform/>
     </command>
     <command id="0x01" name="NetworkPassphraseResponse" direction="responseFromServer">
diff --git a/data_model/master/clusters/WindowCovering.xml b/data_model/master/clusters/WindowCovering.xml
index 2f087914405cf3..f8c60b46901dc9 100644
--- a/data_model/master/clusters/WindowCovering.xml
+++ b/data_model/master/clusters/WindowCovering.xml
@@ -340,13 +340,13 @@ Davis, CA 95616, USA
       </bitfield>
     </bitmap>
     <bitmap name="OperationalStatusBitmap">
-      <bitfield name="Global" from="0" to="1" summary="Global operational state.">
+      <bitfield name="Global" from="1" to="0" summary="Global operational state.">
         <mandatoryConform/>
       </bitfield>
-      <bitfield name="Lift" from="2" to="3" summary="Lift operational state.">
+      <bitfield name="Lift" from="3" to="2" summary="Lift operational state.">
         <mandatoryConform/>
       </bitfield>
-      <bitfield name="Tilt" from="4" to="5" summary="Tilt operational state.">
+      <bitfield name="Tilt" from="5" to="4" summary="Tilt operational state.">
         <mandatoryConform/>
       </bitfield>
     </bitmap>
@@ -464,7 +464,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0008" name="CurrentPositionLiftPercentage" type="percent" default="null">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="true" persistence="nonVolatile" reportable="true" sourceAttribution="false" quieterReporting="true"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="true" sourceAttribution="false" quieterReporting="true"/>
       <optionalConform>
         <andTerm>
           <feature name="LF"/>
@@ -474,7 +474,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0009" name="CurrentPositionTiltPercentage" type="percent" default="null">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="true" persistence="nonVolatile" reportable="true" sourceAttribution="false" quieterReporting="true"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="true" sourceAttribution="false" quieterReporting="true"/>
       <optionalConform>
         <andTerm>
           <feature name="TL"/>
@@ -491,7 +491,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x000B" name="TargetPositionLiftPercent100ths" type="percent100ths" default="null">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="true" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform>
         <andTerm>
           <feature name="LF"/>
@@ -501,7 +501,7 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x000C" name="TargetPositionTiltPercent100ths" type="percent100ths" default="null">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="true" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform>
         <andTerm>
           <feature name="TL"/>
diff --git a/data_model/master/clusters/bridge-clusters-ActionsCluster.xml b/data_model/master/clusters/bridge-clusters-ActionsCluster.xml
index 5b9b54429b9429..4874aca26bc504 100644
--- a/data_model/master/clusters/bridge-clusters-ActionsCluster.xml
+++ b/data_model/master/clusters/bridge-clusters-ActionsCluster.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0025" name="Actions Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0025" name="Actions"/>
diff --git a/data_model/master/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml b/data_model/master/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml
index 318ad7fa54dd2a..4368d991c832f4 100644
--- a/data_model/master/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml
+++ b/data_model/master/clusters/bridge-clusters-BridgedDeviceBasicInformationCluster.xml
@@ -59,17 +59,17 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0039" name="Bridged Device Basic Information Cluster" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added ProductAppearance attribute"/>
     <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
-    <revision revision="4" summary="Updated conformance for UniqueID to mandatory and add the BridgedICDSupport feature. Added DeviceLocation."/>
+    <revision revision="4" summary="Updated conformance for UniqueID to mandatory, ProductID to optional when bridging Matter devices, and add the BridgedICDSupport feature. Added DeviceLocation."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0039" name="Bridged Device Basic Information"/>
   </clusterIds>
   <classification hierarchy="derived" baseCluster="Basic Information" role="utility" picsCode="BRBINFO" scope="Endpoint"/>
   <features>
-    <feature bit="0" code="BIS" name="BridgedICDSupport" summary="A set of features that support Bridged ICD Devices.">
+    <feature bit="20" code="BIS" name="BridgedICDSupport" summary="A set of features that support Bridged ICD Devices.">
       <optionalConform/>
     </feature>
   </features>
@@ -86,9 +86,7 @@ Davis, CA 95616, USA
     <attribute id="0x0003" name="ProductName">
       <optionalConform/>
     </attribute>
-    <attribute id="0x0004" name="ProductID">
-      <disallowConform/>
-    </attribute>
+    <attribute id="0x0004" name="ProductID"/>
     <attribute id="0x0005" name="NodeLabel">
       <optionalConform/>
     </attribute>
@@ -148,7 +146,7 @@ Davis, CA 95616, USA
     </attribute>
   </attributes>
   <commands>
-    <command id="0x00" name="KeepActive" direction="commandToServer" response="Y">
+    <command id="0x80" name="KeepActive" direction="commandToServer" response="Y">
       <access invokePrivilege="operate"/>
       <mandatoryConform>
         <feature name="BIS"/>
@@ -178,11 +176,15 @@ Davis, CA 95616, USA
       <access readPrivilege="view"/>
       <mandatoryConform/>
     </event>
-    <event id="0x04" name="ActiveChanged">
+    <event id="0x80" name="ActiveChanged" priority="info">
       <access readPrivilege="view"/>
       <mandatoryConform>
         <feature name="BIS"/>
       </mandatoryConform>
+      <field id="0" name="PromisedActiveDuration" type="uint32">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
     </event>
   </events>
 </cluster>
\ No newline at end of file
diff --git a/data_model/master/clusters/bridge-clusters-EcosystemInformationCluster.xml b/data_model/master/clusters/bridge-clusters-EcosystemInformationCluster.xml
index 4801cbf88800ae..22cc88097acf75 100644
--- a/data_model/master/clusters/bridge-clusters-EcosystemInformationCluster.xml
+++ b/data_model/master/clusters/bridge-clusters-EcosystemInformationCluster.xml
@@ -59,7 +59,7 @@ Davis, CA 95616, USA
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0750" name="Ecosystem Information Cluster" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0750" name="Ecosystem Information"/>
@@ -68,69 +68,79 @@ Davis, CA 95616, USA
   <dataTypes>
     <struct name="EcosystemDeviceStruct">
       <field id="0" name="DeviceName" type="string" default="empty">
+        <access fabricSensitive="true"/>
         <optionalConform/>
         <constraint type="maxLength" value="64"/>
       </field>
       <field id="1" name="DeviceNameLastEdit" type="epoch-us" default="0">
-        <mandatoryConform>
-          <attribute name="DeviceName"/>
-        </mandatoryConform>
+        <access fabricSensitive="true"/>
       </field>
       <field id="2" name="BridgedEndpoint" type="endpoint-no">
+        <access fabricSensitive="true"/>
         <constraint type="desc"/>
       </field>
       <field id="3" name="OriginalEndpoint" type="endpoint-no">
+        <access fabricSensitive="true"/>
         <constraint type="desc"/>
       </field>
       <field id="4" name="DeviceTypes" type="list">
-        <entry type="device-type">
+        <entry type="ref_DeviceTypeStruct">
           <constraint type="desc"/>
         </entry>
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
         <constraint type="minCount" value="1"/>
       </field>
-      <field id="5" name="UniqueLocationIds" type="list">
-        <entry type="string"/>
+      <field id="5" name="UniqueLocationIDs" type="list">
+        <entry type="string">
+          <constraint type="maxLength" value="64"/>
+        </entry>
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
+        <constraint type="maxCount" value="64"/>
       </field>
-      <field id="6" name="UniqueLocationIdsLastEdit" type="epoch-us" default="0">
+      <field id="6" name="UniqueLocationIDsLastEdit" type="epoch-us" default="0">
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
       </field>
+      <access fabricScoped="true"/>
     </struct>
     <struct name="EcosystemLocationStruct">
-      <field id="0" name="UniqueLocationId" type="string">
+      <field id="0" name="UniqueLocationID" type="string">
+        <access fabricSensitive="true"/>
         <mandatoryConform/>
         <constraint type="maxLength" value="64"/>
       </field>
-      <field id="1" name="HomeLocation" type="HomeLocationStruct">
-        <optionalConform/>
+      <field id="1" name="LocationDescriptor" type="locationdesc">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
       </field>
-      <field id="2" name="HomeLocationLastEdit" type="epoch-us" default="0">
-        <mandatoryConform>
-          <attribute name="HomeLocation"/>
-        </mandatoryConform>
+      <field id="2" name="LocationDescriptorLastEdit" type="epoch-us" default="0">
+        <access fabricSensitive="true"/>
+        <mandatoryConform/>
       </field>
+      <access fabricScoped="true"/>
     </struct>
   </dataTypes>
   <attributes>
     <attribute id="0x0000" name="RemovedOn" type="epoch-us">
       <access read="true" readPrivilege="manage"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
-      <optionalConform/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <mandatoryConform/>
     </attribute>
     <attribute id="0x0001" name="DeviceDirectory" type="list">
       <entry type="EcosystemDeviceStruct"/>
-      <access read="true" readPrivilege="manage"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
+      <access read="true" readPrivilege="manage" fabricScoped="true"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform/>
-      <constraint type="countBetween" from="1" to="256"/>
+      <constraint type="countBetween" from="0" to="256"/>
     </attribute>
     <attribute id="0x0002" name="LocationDirectory" type="list">
       <entry type="EcosystemLocationStruct"/>
-      <access read="true" readPrivilege="manage"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="true" sourceAttribution="false" quieterReporting="false"/>
+      <access read="true" readPrivilege="manage" fabricScoped="true"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
       <mandatoryConform/>
-      <constraint type="countBetween" from="1" to="64"/>
+      <constraint type="countBetween" from="0" to="64"/>
     </attribute>
   </attributes>
 </cluster>
\ No newline at end of file
diff --git a/data_model/master/device_types/Aggregator.xml b/data_model/master/device_types/Aggregator.xml
index 48aa4347d850e1..a99ee1108c3b50 100644
--- a/data_model/master/device_types/Aggregator.xml
+++ b/data_model/master/device_types/Aggregator.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000E" name="Aggregator" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/AirPurifier.xml b/data_model/master/device_types/AirPurifier.xml
index 538d9a4e341efb..62045f090c71a5 100644
--- a/data_model/master/device_types/AirPurifier.xml
+++ b/data_model/master/device_types/AirPurifier.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002D" name="Air Purifier" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Matter release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added On/Off cluster"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/AirQualitySensor.xml b/data_model/master/device_types/AirQualitySensor.xml
index bf56eb754f24c6..756b42e437ac9a 100644
--- a/data_model/master/device_types/AirQualitySensor.xml
+++ b/data_model/master/device_types/AirQualitySensor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002C" name="Air Quality Sensor" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/BaseDeviceType.xml b/data_model/master/device_types/BaseDeviceType.xml
index ddcc49f258f0cb..272b74feb5ff67 100644
--- a/data_model/master/device_types/BaseDeviceType.xml
+++ b/data_model/master/device_types/BaseDeviceType.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="Base Device Type" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Duplicate condition replaces Multiple condition"/>
   </revisionHistory>
   <conditions/>
diff --git a/data_model/master/device_types/BasicVideoPlayer.xml b/data_model/master/device_types/BasicVideoPlayer.xml
index ed82d08bc7a112..d35bbed3211422 100644
--- a/data_model/master/device_types/BasicVideoPlayer.xml
+++ b/data_model/master/device_types/BasicVideoPlayer.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0028" name="Basic Video Player" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Messages and Content Control clusters"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/BatteryStorage.xml b/data_model/master/device_types/BatteryStorage.xml
index 321e9f9dfe2159..5f09eeb1d2dac9 100644
--- a/data_model/master/device_types/BatteryStorage.xml
+++ b/data_model/master/device_types/BatteryStorage.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0018" name="Battery Storage" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/BridgedNode.xml b/data_model/master/device_types/BridgedNode.xml
index 59414205c052b5..6f309001975627 100644
--- a/data_model/master/device_types/BridgedNode.xml
+++ b/data_model/master/device_types/BridgedNode.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0013" name="Bridged Node" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Power Source to device type; Deprecated Power Source Configuration"/>
   </revisionHistory>
   <classification class="utility" scope="endpoint"/>
diff --git a/data_model/master/device_types/CastingVideoClient.xml b/data_model/master/device_types/CastingVideoClient.xml
index 8f816b3e2a8056..949142a6bca151 100644
--- a/data_model/master/device_types/CastingVideoClient.xml
+++ b/data_model/master/device_types/CastingVideoClient.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0029" name="Casting Video Client" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Content App Observer, Messages and Content Control Clusters"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/CastingVideoPlayer.xml b/data_model/master/device_types/CastingVideoPlayer.xml
index 0b65f4f7aab57d..5c88cf92947e0b 100644
--- a/data_model/master/device_types/CastingVideoPlayer.xml
+++ b/data_model/master/device_types/CastingVideoPlayer.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0023" name="Casting Video Player" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Messages and Content Control clusters"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/ColorDimmerSwitch.xml b/data_model/master/device_types/ColorDimmerSwitch.xml
index 190ab6c7fc8b7e..abc027eaec711c 100644
--- a/data_model/master/device_types/ColorDimmerSwitch.xml
+++ b/data_model/master/device_types/ColorDimmerSwitch.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0105" name="Color Dimmer Switch" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/ColorTemperatureLight.xml b/data_model/master/device_types/ColorTemperatureLight.xml
index 4f7cf64a9fd0a2..56db5416cf02c9 100644
--- a/data_model/master/device_types/ColorTemperatureLight.xml
+++ b/data_model/master/device_types/ColorTemperatureLight.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010C" name="Color Temperature Light" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Added optional occupancy sensing"/>
     <revision revision="4" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
diff --git a/data_model/master/device_types/ContactSensor.xml b/data_model/master/device_types/ContactSensor.xml
index 6fa5620a77bebb..2767e5e37a384b 100644
--- a/data_model/master/device_types/ContactSensor.xml
+++ b/data_model/master/device_types/ContactSensor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0015" name="Contact Sensor" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add Boolean State Configuration as optional cluster"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/ContentApp.xml b/data_model/master/device_types/ContentApp.xml
index 300e3122336ef4..81b967db9c8dc1 100644
--- a/data_model/master/device_types/ContentApp.xml
+++ b/data_model/master/device_types/ContentApp.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0024" name="Content App" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Content App Observer cluster"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/ControlBridge.xml b/data_model/master/device_types/ControlBridge.xml
index 04ff66db808cc9..ab07228e728f52 100644
--- a/data_model/master/device_types/ControlBridge.xml
+++ b/data_model/master/device_types/ControlBridge.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0840" name="Control Bridge" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/CookSurface.xml b/data_model/master/device_types/CookSurface.xml
index a32425e2f1df08..3a0e8f062c7495 100644
--- a/data_model/master/device_types/CookSurface.xml
+++ b/data_model/master/device_types/CookSurface.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0077" name="Cook Surface" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/Cooktop.xml b/data_model/master/device_types/Cooktop.xml
index ea94653008d25a..2c7795de12233b 100644
--- a/data_model/master/device_types/Cooktop.xml
+++ b/data_model/master/device_types/Cooktop.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0078" name="Cooktop" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/DeviceEnergyManagement.xml b/data_model/master/device_types/DeviceEnergyManagement.xml
index cf148dabc13679..85f7c5d9a7cd66 100644
--- a/data_model/master/device_types/DeviceEnergyManagement.xml
+++ b/data_model/master/device_types/DeviceEnergyManagement.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x050D" name="Device Energy Management" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="utility" scope="endpoint"/>
   <clusters>
diff --git a/data_model/master/device_types/DimmableLight.xml b/data_model/master/device_types/DimmableLight.xml
index 059a0802f77906..4d6c53e4ae36fd 100644
--- a/data_model/master/device_types/DimmableLight.xml
+++ b/data_model/master/device_types/DimmableLight.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0101" name="Dimmable Light" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/DimmablePlug-InUnit.xml b/data_model/master/device_types/DimmablePlug-InUnit.xml
index 65f6b6e1dd2e9c..73fd2a37c48bab 100644
--- a/data_model/master/device_types/DimmablePlug-InUnit.xml
+++ b/data_model/master/device_types/DimmablePlug-InUnit.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010B" name="Dimmable Plug-In Unit" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Added optional occupancy sensing"/>
     <revision revision="4" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
diff --git a/data_model/master/device_types/DimmerSwitch.xml b/data_model/master/device_types/DimmerSwitch.xml
index 0ad9f23638349a..9dce28fdd7ce71 100644
--- a/data_model/master/device_types/DimmerSwitch.xml
+++ b/data_model/master/device_types/DimmerSwitch.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0104" name="Dimmer Switch" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/Dishwasher.xml b/data_model/master/device_types/Dishwasher.xml
index 6e351f38360e4e..b13f9a42ebcc49 100644
--- a/data_model/master/device_types/Dishwasher.xml
+++ b/data_model/master/device_types/Dishwasher.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0075" name="Dishwasher" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/DoorLock.xml b/data_model/master/device_types/DoorLock.xml
index 8b73bbf8679a6b..121ea179d14589 100644
--- a/data_model/master/device_types/DoorLock.xml
+++ b/data_model/master/device_types/DoorLock.xml
@@ -57,8 +57,8 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000A" name="Door Lock" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
-    <revision revision="2" summary="Initial Matter release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="Initial Matter revision"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
@@ -95,14 +95,49 @@ Davis, CA 95616, USA
             <optionalConform/>
           </otherwiseConform>
         </feature>
+        <feature code="" name="Logging">
+          <disallowConform/>
+        </feature>
+        <feature code="" name="Notification">
+          <disallowConform/>
+        </feature>
       </features>
       <attributes>
+        <attribute code="" name="KeypadOperationEventMask">
+          <disallowConform/>
+        </attribute>
+        <attribute code="" name="RemoteOperationEventMask">
+          <disallowConform/>
+        </attribute>
+        <attribute code="" name="ManualOperationEventMask">
+          <disallowConform/>
+        </attribute>
+        <attribute code="" name="RFIDOperationEventMask">
+          <disallowConform/>
+        </attribute>
+        <attribute code="" name="KeypadProgrammingEventMask">
+          <disallowConform/>
+        </attribute>
+        <attribute code="" name="RemoteProgrammingEventMask">
+          <disallowConform/>
+        </attribute>
+        <attribute code="" name="RFIDProgrammingEventMask">
+          <disallowConform/>
+        </attribute>
         <attribute code="" name="AlarmMask">
           <optionalConform>
             <attribute name="Alarms"/>
           </optionalConform>
         </attribute>
       </attributes>
+      <commands>
+        <command id="" name="OperatingEventNotification">
+          <disallowConform/>
+        </command>
+        <command id="" name="ProgrammingEventNotification">
+          <disallowConform/>
+        </command>
+      </commands>
     </cluster>
   </clusters>
 </deviceType>
\ No newline at end of file
diff --git a/data_model/master/device_types/DoorLockController.xml b/data_model/master/device_types/DoorLockController.xml
index 64d26eba8d8eeb..101dc46f5ccd40 100644
--- a/data_model/master/device_types/DoorLockController.xml
+++ b/data_model/master/device_types/DoorLockController.xml
@@ -57,8 +57,8 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000B" name="Door Lock Controller" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
-    <revision revision="2" summary="Initial Matter release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
+    <revision revision="2" summary="Initial Matter revision"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/EVSE.xml b/data_model/master/device_types/EVSE.xml
index a6a1e3854c88eb..d468cb8a180f22 100644
--- a/data_model/master/device_types/EVSE.xml
+++ b/data_model/master/device_types/EVSE.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x050C" name="Energy EVSE" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Addition of associated Device Energy Management device"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/ElectricalSensor.xml b/data_model/master/device_types/ElectricalSensor.xml
index 62c6dd9b4128b2..75c4b0bb7cbbed 100644
--- a/data_model/master/device_types/ElectricalSensor.xml
+++ b/data_model/master/device_types/ElectricalSensor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0510" name="Electrical Sensor" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="utility" scope="endpoint"/>
   <clusters>
diff --git a/data_model/master/device_types/EnergyTariff.xml b/data_model/master/device_types/EnergyTariff.xml
index bf27554ff281db..887bfa420d8fd8 100644
--- a/data_model/master/device_types/EnergyTariff.xml
+++ b/data_model/master/device_types/EnergyTariff.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x050B" name="Energy Tariff" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Matter release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/EnergyTariffCalendar.xml b/data_model/master/device_types/EnergyTariffCalendar.xml
index ee3a6b9347db38..70d74b7239f41c 100644
--- a/data_model/master/device_types/EnergyTariffCalendar.xml
+++ b/data_model/master/device_types/EnergyTariffCalendar.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x050B" name="Energy Tariff Calendar" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Matter release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/ExtendedColorLight.xml b/data_model/master/device_types/ExtendedColorLight.xml
index b4057d6b5bc997..0678094669459f 100644
--- a/data_model/master/device_types/ExtendedColorLight.xml
+++ b/data_model/master/device_types/ExtendedColorLight.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010D" name="Extended Color Light" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation; integrate DM CCB 3501"/>
     <revision revision="3" summary="Added optional occupancy sensing"/>
     <revision revision="4" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
diff --git a/data_model/master/device_types/ExtractorHood.xml b/data_model/master/device_types/ExtractorHood.xml
index 6606b377f47a39..3e8064adb149f4 100644
--- a/data_model/master/device_types/ExtractorHood.xml
+++ b/data_model/master/device_types/ExtractorHood.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x007A" name="Extractor Hood" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/Fan.xml b/data_model/master/device_types/Fan.xml
index 8bf8347e93c5b0..e5184cfe22aec7 100644
--- a/data_model/master/device_types/Fan.xml
+++ b/data_model/master/device_types/Fan.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002B" name="Fan" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added ability to be composed with a Thermostat for fan heaters"/>
     <revision revision="3" summary="Added On/Off cluster"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/FlowSensor.xml b/data_model/master/device_types/FlowSensor.xml
index bcc27b318aac36..6a9023060e12f9 100644
--- a/data_model/master/device_types/FlowSensor.xml
+++ b/data_model/master/device_types/FlowSensor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0306" name="Flow Sensor" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/GenericSwitch.xml b/data_model/master/device_types/GenericSwitch.xml
index acfa0a95005291..b8bc394b96e2e8 100644
--- a/data_model/master/device_types/GenericSwitch.xml
+++ b/data_model/master/device_types/GenericSwitch.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x000F" name="Generic Switch" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Removed requirement for Fixed Label cluster (can use TagList which was added in Descriptor cluster)"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/HeatPump.xml b/data_model/master/device_types/HeatPump.xml
index ae0ce0e9a4d30a..61f556c6ed2a9b 100644
--- a/data_model/master/device_types/HeatPump.xml
+++ b/data_model/master/device_types/HeatPump.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0309" name="Heat Pump" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/HumidifierDehumidifier.xml b/data_model/master/device_types/HumidifierDehumidifier.xml
index a917cbff4450f0..973919635fb4ae 100644
--- a/data_model/master/device_types/HumidifierDehumidifier.xml
+++ b/data_model/master/device_types/HumidifierDehumidifier.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x007D" name="Humidifier/Dehumidifier" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
 </deviceType>
\ No newline at end of file
diff --git a/data_model/master/device_types/HumiditySensor.xml b/data_model/master/device_types/HumiditySensor.xml
index 4a1808d7e0c580..c6def400a2a6bb 100644
--- a/data_model/master/device_types/HumiditySensor.xml
+++ b/data_model/master/device_types/HumiditySensor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0307" name="Humidity Sensor" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Zigbee 3.0"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/JointFabricAdmin.xml b/data_model/master/device_types/JointFabricAdmin.xml
index eb57fad58127a4..7d29cbba1305d5 100644
--- a/data_model/master/device_types/JointFabricAdmin.xml
+++ b/data_model/master/device_types/JointFabricAdmin.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="Joint Fabric Administrator" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="utility" scope="endpoint"/>
   <clusters>
diff --git a/data_model/master/device_types/LaundryDryer.xml b/data_model/master/device_types/LaundryDryer.xml
index d4692c7ad818a5..36dc182c393bd7 100644
--- a/data_model/master/device_types/LaundryDryer.xml
+++ b/data_model/master/device_types/LaundryDryer.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x007C" name="Laundry Dryer" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/LaundryWasher.xml b/data_model/master/device_types/LaundryWasher.xml
index 03b85f3bd363b4..d88ee7e9fd94ca 100644
--- a/data_model/master/device_types/LaundryWasher.xml
+++ b/data_model/master/device_types/LaundryWasher.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0073" name="Laundry Washer" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/LightSensor.xml b/data_model/master/device_types/LightSensor.xml
index 0eca130f921623..e7200e347726aa 100644
--- a/data_model/master/device_types/LightSensor.xml
+++ b/data_model/master/device_types/LightSensor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0106" name="Light Sensor" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Restricting Groups client to Zigbee."/>
   </revisionHistory>
diff --git a/data_model/master/device_types/MicrowaveOven.xml b/data_model/master/device_types/MicrowaveOven.xml
index 3ae1fd8d5bf22d..98d2902d049610 100644
--- a/data_model/master/device_types/MicrowaveOven.xml
+++ b/data_model/master/device_types/MicrowaveOven.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0079" name="Microwave Oven" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/ModeSelectDeviceType.xml b/data_model/master/device_types/ModeSelectDeviceType.xml
index 7848ba0adc787f..ad4cf56671243b 100644
--- a/data_model/master/device_types/ModeSelectDeviceType.xml
+++ b/data_model/master/device_types/ModeSelectDeviceType.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0027" name="Mode Select" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/MountedDimmableLoadControl.xml b/data_model/master/device_types/MountedDimmableLoadControl.xml
new file mode 100644
index 00000000000000..2527eb6aaefcd2
--- /dev/null
+++ b/data_model/master/device_types/MountedDimmableLoadControl.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="Mounted Dimmable Load Control" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="Lighting">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="OnOff">
+          <mandatoryConform/>
+        </feature>
+        <feature code="" name="Lighting">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="CurrentLevel">
+          <constraint type="between" from="1" to="254"/>
+        </attribute>
+        <attribute code="" name="MinLevel">
+          <constraint type="allowed" value="1"/>
+        </attribute>
+        <attribute code="" name="MaxLevel">
+          <constraint type="allowed" value="254"/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <commands>
+        <command id="" name="CopyScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/master/device_types/MountedOnOffControl.xml b/data_model/master/device_types/MountedOnOffControl.xml
new file mode 100644
index 00000000000000..1be3cf746418aa
--- /dev/null
+++ b/data_model/master/device_types/MountedOnOffControl.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<!--
+Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
+The information within this document is the property of the Connectivity
+Standards Alliance and its use and disclosure are restricted, except as
+expressly set forth herein.
+
+Connectivity Standards Alliance hereby grants you a fully-paid, non-exclusive,
+nontransferable, worldwide, limited and revocable license (without the right to
+sublicense), under Connectivity Standards Alliance's applicable copyright
+rights, to view, download, save, reproduce and use the document solely for your
+own internal purposes and in accordance with the terms of the license set forth
+herein. This license does not authorize you to, and you expressly warrant that
+you shall not: (a) permit others (outside your organization) to use this
+document; (b) post or publish this document; (c) modify, adapt, translate, or
+otherwise change this document in any manner or create any derivative work
+based on this document; (d) remove or modify any notice or label on this
+document, including this Copyright Notice, License and Disclaimer. The
+Connectivity Standards Alliance does not grant you any license hereunder other
+than as expressly stated herein.
+
+Elements of this document may be subject to third party intellectual property
+rights, including without limitation, patent, copyright or trademark rights,
+and any such third party may or may not be a member of the Connectivity
+Standards Alliance. Connectivity Standards Alliance members grant other
+Connectivity Standards Alliance members certain intellectual property rights as
+set forth in the Connectivity Standards Alliance IPR Policy. Connectivity
+Standards Alliance members do not grant you any rights under this license. The
+Connectivity Standards Alliance is not responsible for, and shall not be held
+responsible in any manner for, identifying or failing to identify any or all
+such third party intellectual property rights. Please visit www.csa-iot.org for
+more information on how to become a member of the Connectivity Standards
+Alliance.
+
+This document and the information contained herein are provided on an “AS IS”
+basis and the Connectivity Standards Alliance DISCLAIMS ALL WARRANTIES EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO (A) ANY WARRANTY THAT THE USE OF THE
+INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OF THIRD PARTIES (INCLUDING
+WITHOUT LIMITATION ANY INTELLECTUAL PROPERTY RIGHTS INCLUDING PATENT, COPYRIGHT
+OR TRADEMARK RIGHTS); OR (B) ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT. IN NO EVENT WILL THE
+CONNECTIVITY STANDARDS ALLIANCE BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF
+BUSINESS, LOSS OF USE OF DATA, INTERRUPTION OF BUSINESS, OR FOR ANY OTHER
+DIRECT, INDIRECT, SPECIAL OR EXEMPLARY, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+DAMAGES OF ANY KIND, IN CONTRACT OR IN TORT, IN CONNECTION WITH THIS DOCUMENT
+OR THE INFORMATION CONTAINED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+LOSS OR DAMAGE.
+
+All company, brand and product names in this document may be trademarks that
+are the sole property of their respective owners.
+
+This notice and disclaimer must be included on all copies of this document.
+
+Connectivity Standards Alliance
+508 Second Street, Suite 206
+Davis, CA 95616, USA
+-->
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="" name="Mounted On/Off Control" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial release"/>
+  </revisionHistory>
+  <classification class="simple" scope="endpoint"/>
+  <conditions/>
+  <clusters>
+    <cluster id="0x0003" name="Identify" side="server">
+      <mandatoryConform/>
+      <commands>
+        <command id="" name="TriggerEffect">
+          <mandatoryConform/>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0004" name="Groups" side="server">
+      <mandatoryConform/>
+    </cluster>
+    <cluster id="0x0006" name="On/Off" side="server">
+      <mandatoryConform/>
+      <features>
+        <feature code="" name="Lighting">
+          <mandatoryConform/>
+        </feature>
+      </features>
+    </cluster>
+    <cluster id="0x0008" name="Level Control" side="server">
+      <optionalConform/>
+      <features>
+        <feature code="" name="OnOff">
+          <mandatoryConform/>
+        </feature>
+        <feature code="" name="Lighting">
+          <mandatoryConform/>
+        </feature>
+      </features>
+      <attributes>
+        <attribute code="" name="CurrentLevel">
+          <constraint type="between" from="1" to="254"/>
+        </attribute>
+        <attribute code="" name="MinLevel">
+          <constraint type="allowed" value="1"/>
+        </attribute>
+        <attribute code="" name="MaxLevel">
+          <constraint type="allowed" value="254"/>
+        </attribute>
+      </attributes>
+    </cluster>
+    <cluster id="0x0062" name="Scenes Management" side="server">
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform/>
+      </otherwiseConform>
+      <commands>
+        <command id="" name="CopyScene">
+          <otherwiseConform>
+            <provisionalConform/>
+            <mandatoryConform/>
+          </otherwiseConform>
+        </command>
+      </commands>
+    </cluster>
+    <cluster id="0x0406" name="Occupancy Sensing" side="client">
+      <optionalConform/>
+    </cluster>
+  </clusters>
+</deviceType>
\ No newline at end of file
diff --git a/data_model/master/device_types/NetworkInfraManager.xml b/data_model/master/device_types/NetworkInfraManager.xml
index a4d17e11c0faaa..58cbae2e7ab440 100644
--- a/data_model/master/device_types/NetworkInfraManager.xml
+++ b/data_model/master/device_types/NetworkInfraManager.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0090" name="Network Infrastructure Manager" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/OccupancySensor.xml b/data_model/master/device_types/OccupancySensor.xml
index 233d04f196e388..f257bab38a7686 100644
--- a/data_model/master/device_types/OccupancySensor.xml
+++ b/data_model/master/device_types/OccupancySensor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0107" name="Occupancy Sensor" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Restricting Groups client to Zigbee"/>
     <revision revision="4" summary="Add Boolean State Configuration as optional cluster"/>
diff --git a/data_model/master/device_types/OnOffLight.xml b/data_model/master/device_types/OnOffLight.xml
index f71c0bf77fa42c..c74f5f79000919 100644
--- a/data_model/master/device_types/OnOffLight.xml
+++ b/data_model/master/device_types/OnOffLight.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0100" name="On/Off Light" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/OnOffLightSwitch.xml b/data_model/master/device_types/OnOffLightSwitch.xml
index d6ac7f79520d26..0cfa5ba7a3702c 100644
--- a/data_model/master/device_types/OnOffLightSwitch.xml
+++ b/data_model/master/device_types/OnOffLightSwitch.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0103" name="On/Off Light Switch" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/OnOffPlug-inUnit.xml b/data_model/master/device_types/OnOffPlug-inUnit.xml
index 888f365bed0b83..946f7919516e2d 100644
--- a/data_model/master/device_types/OnOffPlug-inUnit.xml
+++ b/data_model/master/device_types/OnOffPlug-inUnit.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x010A" name="On/Off Plug-in Unit" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/OnOffSensor.xml b/data_model/master/device_types/OnOffSensor.xml
index 935a438fb0bbef..0fc76f8314a6b5 100644
--- a/data_model/master/device_types/OnOffSensor.xml
+++ b/data_model/master/device_types/OnOffSensor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0850" name="On/Off Sensor" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/OtaProvider.xml b/data_model/master/device_types/OtaProvider.xml
index 375ab4e36aa987..b148d27ebb74e5 100644
--- a/data_model/master/device_types/OtaProvider.xml
+++ b/data_model/master/device_types/OtaProvider.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0014" name="OTA Provider" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="utility" scope="node"/>
   <clusters>
diff --git a/data_model/master/device_types/OtaRequestor.xml b/data_model/master/device_types/OtaRequestor.xml
index 840e322bdccb72..d782ee992c454b 100644
--- a/data_model/master/device_types/OtaRequestor.xml
+++ b/data_model/master/device_types/OtaRequestor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0012" name="OTA Requestor" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="utility" scope="node"/>
   <clusters>
diff --git a/data_model/master/device_types/Oven.xml b/data_model/master/device_types/Oven.xml
index 9c5d23e86afda7..d34bc4c52bfbb6 100644
--- a/data_model/master/device_types/Oven.xml
+++ b/data_model/master/device_types/Oven.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x007B" name="Oven" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Heater requirement"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/PowerSource.xml b/data_model/master/device_types/PowerSource.xml
index 9ed71e905535bd..4e6c6defabccf9 100644
--- a/data_model/master/device_types/PowerSource.xml
+++ b/data_model/master/device_types/PowerSource.xml
@@ -58,7 +58,7 @@ Davis, CA 95616, USA
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0011" name="Power Source" revision="1">
   <classification class="utility" scope="node"/>
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <clusters>
     <cluster id="0x002F" name="Power Source" side="server">
diff --git a/data_model/master/device_types/PressureSensor.xml b/data_model/master/device_types/PressureSensor.xml
index f2b7855db91c83..5b7ef86c25cc3d 100644
--- a/data_model/master/device_types/PressureSensor.xml
+++ b/data_model/master/device_types/PressureSensor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0305" name="Pressure Sensor" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/Pump.xml b/data_model/master/device_types/Pump.xml
index 461725136abaec..a39cd97b87e7ad 100644
--- a/data_model/master/device_types/Pump.xml
+++ b/data_model/master/device_types/Pump.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0303" name="Pump" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/PumpController.xml b/data_model/master/device_types/PumpController.xml
index 99acf1fa1c5757..25e9a8e982b5ff 100644
--- a/data_model/master/device_types/PumpController.xml
+++ b/data_model/master/device_types/PumpController.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0304" name="Pump Controller" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
     <revision revision="4" summary="Remove Binding client as a result of review of CCB4058"/>
diff --git a/data_model/master/device_types/RainSensor.xml b/data_model/master/device_types/RainSensor.xml
index 473de6e31d1598..a03060c5415dc0 100644
--- a/data_model/master/device_types/RainSensor.xml
+++ b/data_model/master/device_types/RainSensor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0044" name="Rain Sensor" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/Refrigerator.xml b/data_model/master/device_types/Refrigerator.xml
index 4899906c3b985e..c8bdf86e3ef737 100644
--- a/data_model/master/device_types/Refrigerator.xml
+++ b/data_model/master/device_types/Refrigerator.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0070" name="Refrigerator" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Cooler requirement"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/RoboticVacuumCleaner.xml b/data_model/master/device_types/RoboticVacuumCleaner.xml
index 2657a560109829..fd30668cd2e084 100644
--- a/data_model/master/device_types/RoboticVacuumCleaner.xml
+++ b/data_model/master/device_types/RoboticVacuumCleaner.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0074" name="Robotic Vacuum Cleaner" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Add cluster usage constraints and informative data. Remove the element requirements section, after moving all constraints to the respective cluster specifications."/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/RoomAirConditioner.xml b/data_model/master/device_types/RoomAirConditioner.xml
index 305a893dabc0fe..e2b3061a42b515 100644
--- a/data_model/master/device_types/RoomAirConditioner.xml
+++ b/data_model/master/device_types/RoomAirConditioner.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0072" name="Room Air Conditioner" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Thermostat User Interface Configuration cluster added; Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/RootNodeDeviceType.xml b/data_model/master/device_types/RootNodeDeviceType.xml
index 7dfd31996cc8e5..c96759503bfb13 100644
--- a/data_model/master/device_types/RootNodeDeviceType.xml
+++ b/data_model/master/device_types/RootNodeDeviceType.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0016" name="Root Node" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Power Source to device type; Deprecated Power Source Configuration"/>
   </revisionHistory>
   <classification class="node" scope="node"/>
diff --git a/data_model/master/device_types/SecondaryNetworkInterface.xml b/data_model/master/device_types/SecondaryNetworkInterface.xml
index 51b4dc0e2ec4fa..8217aea71529d0 100644
--- a/data_model/master/device_types/SecondaryNetworkInterface.xml
+++ b/data_model/master/device_types/SecondaryNetworkInterface.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0019" name="Secondary Network Interface" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="utility" scope="endpoint"/>
   <clusters>
diff --git a/data_model/master/device_types/SmokeCOAlarm.xml b/data_model/master/device_types/SmokeCOAlarm.xml
index 518809d449e35a..769e6f5f91bbe1 100644
--- a/data_model/master/device_types/SmokeCOAlarm.xml
+++ b/data_model/master/device_types/SmokeCOAlarm.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0076" name="Smoke CO Alarm" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/SolarPower.xml b/data_model/master/device_types/SolarPower.xml
index 743da25e7a9a20..7556fb519a685d 100644
--- a/data_model/master/device_types/SolarPower.xml
+++ b/data_model/master/device_types/SolarPower.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0017" name="Solar Power" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/Speaker.xml b/data_model/master/device_types/Speaker.xml
index d1d9d85beb84c8..d3f9b1166e4458 100644
--- a/data_model/master/device_types/Speaker.xml
+++ b/data_model/master/device_types/Speaker.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0022" name="Speaker" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/TemperatureControlledCabinet.xml b/data_model/master/device_types/TemperatureControlledCabinet.xml
index 299037e145d901..68788e22d7db06 100644
--- a/data_model/master/device_types/TemperatureControlledCabinet.xml
+++ b/data_model/master/device_types/TemperatureControlledCabinet.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0071" name="Temperature Controlled Cabinet" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Extension to heating cabinets"/>
     <revision revision="3" summary="Added exclusivity for conditions"/>
   </revisionHistory>
diff --git a/data_model/master/device_types/TemperatureSensor.xml b/data_model/master/device_types/TemperatureSensor.xml
index d6ccd5c18db89f..bf3221858dc103 100644
--- a/data_model/master/device_types/TemperatureSensor.xml
+++ b/data_model/master/device_types/TemperatureSensor.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0302" name="Temperature Sensor" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/Thermostat.xml b/data_model/master/device_types/Thermostat.xml
index 6acdf63b10eba0..dfc55d628a5b6e 100644
--- a/data_model/master/device_types/Thermostat.xml
+++ b/data_model/master/device_types/Thermostat.xml
@@ -55,11 +55,12 @@ Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
 -->
-<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0301" name="Thermostat" revision="3">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0301" name="Thermostat" revision="4">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation, added Clusters required for Matter support, restricted legacy elements to Zigbee only"/>
     <revision revision="3" summary="Addition of Energy Preference cluster and updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
+    <revision revision="4" summary="Remove Time Synchronization cluster and Zigbee only clusters, remove provisional marking from Energy Preference cluster"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
@@ -72,60 +73,27 @@ Davis, CA 95616, USA
         <attribute name="Active"/>
       </mandatoryConform>
     </cluster>
-    <cluster id="0x0009" name="Alarms" side="server">
-      <optionalConform>
-        <condition name="Zigbee"/>
-      </optionalConform>
-    </cluster>
-    <cluster id="0x000A" name="Time" side="client">
-      <optionalConform>
-        <condition name="Zigbee"/>
-      </optionalConform>
-    </cluster>
-    <cluster id="0x0038" name="Time Synchronization" side="server">
-      <optionalConform/>
-    </cluster>
-    <cluster id="0x0038" name="Time Synchronization" side="client">
-      <optionalConform/>
-    </cluster>
-    <cluster id="0x0062" name="Scenes Management" side="server">
-      <otherwiseConform>
-        <provisionalConform/>
-        <optionalConform/>
-      </otherwiseConform>
-    </cluster>
     <cluster id="0x009B" name="Energy Preference" side="server">
       <optionalConform/>
     </cluster>
     <cluster id="0x0201" name="Thermostat" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="Schedule">
-          <otherwiseConform>
-            <optionalConform>
-              <condition name="Zigbee"/>
-            </optionalConform>
-            <provisionalConform/>
-          </otherwiseConform>
+        <feature code="" name="ScheduleConfiguration">
+          <disallowConform/>
         </feature>
       </features>
       <attributes>
         <attribute code="" name="AlarmMask">
-          <optionalConform>
-            <condition name="Zigbee"/>
-          </optionalConform>
+          <disallowConform/>
         </attribute>
       </attributes>
       <commands>
-        <command id="" name="Get Relay Status Log">
-          <optionalConform>
-            <condition name="Zigbee"/>
-          </optionalConform>
+        <command id="" name="GetRelayStatusLog">
+          <disallowConform/>
         </command>
-        <command id="" name="Get Relay Status Log Response">
-          <optionalConform>
-            <condition name="Zigbee"/>
-          </optionalConform>
+        <command id="" name="GetRelayStatusLogResponse">
+          <disallowConform/>
         </command>
       </commands>
     </cluster>
diff --git a/data_model/master/device_types/ThreadBorderRouter.xml b/data_model/master/device_types/ThreadBorderRouter.xml
index 73561999d60eba..abe38a81396cd6 100644
--- a/data_model/master/device_types/ThreadBorderRouter.xml
+++ b/data_model/master/device_types/ThreadBorderRouter.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0091" name="Thread Border Router" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/VideoRemoteControl.xml b/data_model/master/device_types/VideoRemoteControl.xml
index 7896a6f6ee6be5..de83b02508a89f 100644
--- a/data_model/master/device_types/VideoRemoteControl.xml
+++ b/data_model/master/device_types/VideoRemoteControl.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x002A" name="Video Remote Control" revision="2">
   <revisionHistory>
-    <revision revision="1" summary="Initial release of this document"/>
+    <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Added Content Control cluster"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/master/device_types/WaterFreezeDetector.xml b/data_model/master/device_types/WaterFreezeDetector.xml
index f3c5f0580af21f..b2f4a49a7847e4 100644
--- a/data_model/master/device_types/WaterFreezeDetector.xml
+++ b/data_model/master/device_types/WaterFreezeDetector.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0041" name="Water Freeze Detector" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/WaterHeater.xml b/data_model/master/device_types/WaterHeater.xml
index 6e80928d792cfc..9d038d89c55563 100644
--- a/data_model/master/device_types/WaterHeater.xml
+++ b/data_model/master/device_types/WaterHeater.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x050F" name="Water Heater" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/WaterLeakDetector.xml b/data_model/master/device_types/WaterLeakDetector.xml
index 0518d148910c78..7277ce69908fb6 100644
--- a/data_model/master/device_types/WaterLeakDetector.xml
+++ b/data_model/master/device_types/WaterLeakDetector.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0043" name="Water Leak Detector" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/WaterValve.xml b/data_model/master/device_types/WaterValve.xml
index 5c65f4565f6746..21b77edf5fc614 100644
--- a/data_model/master/device_types/WaterValve.xml
+++ b/data_model/master/device_types/WaterValve.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0042" name="Water Valve" revision="1">
   <revisionHistory>
-    <revision revision="1" summary="Initial release"/>
+    <revision revision="1" summary="Initial revision"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/master/device_types/WindowCovering.xml b/data_model/master/device_types/WindowCovering.xml
index a2d54453b7337f..a2e16beba60ee1 100644
--- a/data_model/master/device_types/WindowCovering.xml
+++ b/data_model/master/device_types/WindowCovering.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0202" name="Window Covering" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
@@ -75,15 +75,6 @@ Davis, CA 95616, USA
         <optionalConform/>
       </otherwiseConform>
     </cluster>
-    <cluster id="0x0062" name="Scenes Management" side="server">
-      <otherwiseConform>
-        <provisionalConform/>
-        <mandatoryConform>
-          <attribute name="Active"/>
-        </mandatoryConform>
-        <optionalConform/>
-      </otherwiseConform>
-    </cluster>
     <cluster id="0x0102" name="Window Covering" side="server">
       <mandatoryConform/>
       <features>
diff --git a/data_model/master/device_types/WindowCoveringController.xml b/data_model/master/device_types/WindowCoveringController.xml
index c48f327754c599..189fee3d9d6303 100644
--- a/data_model/master/device_types/WindowCoveringController.xml
+++ b/data_model/master/device_types/WindowCoveringController.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 -->
 <deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0203" name="Window Covering Controller" revision="3">
   <revisionHistory>
-    <revision revision="1" summary="Initial Zigbee 3.0 release"/>
+    <revision revision="1" summary="Initial Zigbee 3.0 revision"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
   </revisionHistory>
@@ -78,15 +78,6 @@ Davis, CA 95616, USA
         <optionalConform/>
       </otherwiseConform>
     </cluster>
-    <cluster id="0x0062" name="Scenes Management" side="client">
-      <otherwiseConform>
-        <provisionalConform/>
-        <mandatoryConform>
-          <attribute name="Active"/>
-        </mandatoryConform>
-        <optionalConform/>
-      </otherwiseConform>
-    </cluster>
     <cluster id="0x0102" name="Window Covering" side="client">
       <mandatoryConform/>
       <features>
diff --git a/data_model/master/spec_sha b/data_model/master/spec_sha
index 51aac4d9e877f4..16b2cbb1caa026 100644
--- a/data_model/master/spec_sha
+++ b/data_model/master/spec_sha
@@ -1 +1 @@
-358a64a52ea9583f19be23c7da0e33f19d4b1ee0
+12e2fa3014b316b202eed892cb50dec7b6851d8e
diff --git a/docs/spec_clusters.md b/docs/spec_clusters.md
index ef58f016154446..05bd215fe583dc 100644
--- a/docs/spec_clusters.md
+++ b/docs/spec_clusters.md
@@ -7,7 +7,6 @@ This file was **AUTOMATICALLY** generated by `python scripts/generate_spec_xml.p
 |4             |0x0004    |Groups                                                    |
 |6             |0x0006    |On/Off                                                    |
 |8             |0x0008    |Level Control                                             |
-|28            |0x001C    |Pulse Width Modulation                                    |
 |29            |0x001D    |Descriptor                                                |
 |30            |0x001E    |Binding                                                   |
 |31            |0x001F    |AccessControl                                             |
@@ -63,23 +62,31 @@ This file was **AUTOMATICALLY** generated by `python scripts/generate_spec_xml.p
 |98            |0x0062    |Scenes Management                                         |
 |113           |0x0071    |HEPA Filter Monitoring                                    |
 |114           |0x0072    |Activated Carbon Filter Monitoring                        |
+|121           |0x0079    |Water Tank Level Monitoring                               |
 |128           |0x0080    |Boolean State Configuration                               |
 |129           |0x0081    |Valve Configuration and Control                           |
 |144           |0x0090    |Electrical Power Measurement                              |
 |145           |0x0091    |Electrical Energy Measurement                             |
+|148           |0x0094    |Water Heater Management                                   |
+|149           |0x0095    |Energy Price                                              |
+|150           |0x0096    |Demand Response Load Control                              |
 |151           |0x0097    |Messages                                                  |
 |152           |0x0098    |Device Energy Management                                  |
 |153           |0x0099    |Energy EVSE                                               |
+|154           |0x009A    |Energy Calendar                                           |
 |155           |0x009B    |Energy Preference                                         |
 |156           |0x009C    |Power Topology                                            |
 |157           |0x009D    |Energy EVSE Mode                                          |
+|158           |0x009E    |Water Heater Mode                                         |
 |159           |0x009F    |Device Energy Management Mode                             |
 |257           |0x0101    |Door Lock                                                 |
 |258           |0x0102    |Window Covering                                           |
+|336           |0x0150    |Service Area                                              |
 |512           |0x0200    |Pump Configuration and Control                            |
 |513           |0x0201    |Thermostat                                                |
 |514           |0x0202    |Fan Control                                               |
 |516           |0x0204    |Thermostat User Interface Configuration                   |
+|517           |0x0205    |Humidistat                                                |
 |768           |0x0300    |Color Control                                             |
 |769           |0x0301    |Ballast Configuration                                     |
 |1024          |0x0400    |Illuminance Measurement                                   |
@@ -98,6 +105,10 @@ This file was **AUTOMATICALLY** generated by `python scripts/generate_spec_xml.p
 |1069          |0x042D    |PM10 Concentration Measurement                            |
 |1070          |0x042E    |Total Volatile Organic Compounds Concentration Measurement|
 |1071          |0x042F    |Radon Concentration Measurement                           |
+|1104          |0x0450    |Network Identity Management                               |
+|1105          |0x0451    |Wi-Fi Network Management                                  |
+|1106          |0x0452    |Thread Border Router Management                           |
+|1107          |0x0453    |Thread Network Directory                                  |
 |1283          |0x0503    |Wake on LAN                                               |
 |1284          |0x0504    |Channel                                                   |
 |1285          |0x0505    |Target Navigator                                          |
@@ -112,3 +123,5 @@ This file was **AUTOMATICALLY** generated by `python scripts/generate_spec_xml.p
 |1294          |0x050E    |Account Login                                             |
 |1295          |0x050F    |Content Control                                           |
 |1296          |0x0510    |Content App Observer                                      |
+|1872          |0x0750    |Ecosystem Information                                     |
+|1873          |0x0751    |Commissioner Control                                      |
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 28b6ab7c6fcb1b..7dca226d8287b5 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -2603,7 +2603,7 @@ endpoint 0 {
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
+    ram      attribute featureMap default = 1;
     callback attribute clusterRevision;
   }
 
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index 605da39d72da56..8e25d9248c1429 100644
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -401,7 +401,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/src/python_testing/TC_DeviceConformance.py b/src/python_testing/TC_DeviceConformance.py
index c64a3470d19ed1..2a0fe309f20a4c 100644
--- a/src/python_testing/TC_DeviceConformance.py
+++ b/src/python_testing/TC_DeviceConformance.py
@@ -76,8 +76,7 @@ def record_warning(location, problem):
         ignore_attributes: dict[int, list[int]] = {}
         if ignore_in_progress:
             # This is a manually curated list of attributes that are in-progress in the SDK, but have landed in the spec
-            in_progress_attributes = {Clusters.BasicInformation.id: [0x15, 0x016],
-                                      Clusters.PowerSource.id: [0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A]}
+            in_progress_attributes = {Clusters.ThreadNetworkDiagnostics.id: [0x3F, 0x40]}
             ignore_attributes.update(in_progress_attributes)
 
         if is_ci:
@@ -337,7 +336,9 @@ async def setup_class(self):
         await self.setup_class_helper()
 
     def test_TC_IDM_10_2(self):
-        ignore_in_progress = self.user_params.get("ignore_in_progress", False)
+        # TODO: Turn this off after TE2
+        # https://github.com/project-chip/connectedhomeip/issues/34615
+        ignore_in_progress = self.user_params.get("ignore_in_progress", True)
         is_ci = self.check_pics('PICS_SDK_CI_ONLY')
         success, problems = self.check_conformance(ignore_in_progress, is_ci)
         self.problems.extend(problems)
diff --git a/src/python_testing/TestSpecParsingSupport.py b/src/python_testing/TestSpecParsingSupport.py
index fadd6a517a4531..0523ebbcd6a6df 100644
--- a/src/python_testing/TestSpecParsingSupport.py
+++ b/src/python_testing/TestSpecParsingSupport.py
@@ -235,20 +235,17 @@ def setup_class(self):
     def test_build_xml_override(self):
         # checks that the 1.3 spec (default) does not contain in-progress clusters and the TOT does
         tot_xml_clusters, problems = build_xml_clusters(PrebuiltDataModelDirectory.kMaster)
-        asserts.assert_greater(len(set(tot_xml_clusters.keys()) - set(self.spec_xml_clusters.keys())),
+        one_three_clusters, problems = build_xml_clusters(PrebuiltDataModelDirectory.k1_3)
+        asserts.assert_greater(len(set(tot_xml_clusters.keys()) - set(one_three_clusters.keys())),
                                0, "In progress dir does not contain any clusters not in 1.3")
         # only the pulse width modulation cluster was removed post 1.3
-        asserts.assert_equal(set(self.spec_xml_clusters.keys()) - set(tot_xml_clusters.keys()),
+        asserts.assert_equal(set(one_three_clusters.keys()) - set(tot_xml_clusters.keys()),
                              set([Clusters.PulseWidthModulation.id]), "There are some 1.3 clusters that are not included in the TOT spec")
 
-        str_path = str(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', 'data_model', '1.3', 'clusters'))
+        str_path = str(os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', 'data_model', 'master', 'clusters'))
         string_override_check, problems = build_xml_clusters(str_path)
         asserts.assert_equal(string_override_check.keys(), self.spec_xml_clusters.keys(), "Mismatched cluster generation")
 
-        path = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', 'data_model', '1.3', 'clusters')
-        path_override_check, problems = build_xml_clusters(path)
-        asserts.assert_equal(path_override_check.keys(), self.spec_xml_clusters.keys(), "Mismatched cluster generation")
-
         with asserts.assert_raises(SpecParsingException):
             build_xml_clusters("baddir")
 
diff --git a/src/python_testing/spec_parsing_support.py b/src/python_testing/spec_parsing_support.py
index e106167e7b5487..1b8e29c4cf33cf 100644
--- a/src/python_testing/spec_parsing_support.py
+++ b/src/python_testing/spec_parsing_support.py
@@ -517,7 +517,7 @@ def _get_data_model_directory(data_model_directory: typing.Union[PrebuiltDataMod
         return data_model_directory
 
 
-def build_xml_clusters(data_model_directory: typing.Union[PrebuiltDataModelDirectory, str] = PrebuiltDataModelDirectory.k1_3) -> tuple[dict[uint, XmlCluster], list[ProblemNotice]]:
+def build_xml_clusters(data_model_directory: typing.Union[PrebuiltDataModelDirectory, str] = PrebuiltDataModelDirectory.kMaster) -> tuple[dict[uint, XmlCluster], list[ProblemNotice]]:
     dir = _get_data_model_directory(data_model_directory, DataModelLevel.kCluster)
 
     clusters: dict[int, XmlCluster] = {}
@@ -743,7 +743,7 @@ def parse_single_device_type(root: ElementTree.Element) -> tuple[list[ProblemNot
     return device_types, problems
 
 
-def build_xml_device_types(data_model_directory: typing.Union[PrebuiltDataModelDirectory, str] = PrebuiltDataModelDirectory.k1_3) -> tuple[dict[int, XmlDeviceType], list[ProblemNotice]]:
+def build_xml_device_types(data_model_directory: typing.Union[PrebuiltDataModelDirectory, str] = PrebuiltDataModelDirectory.kMaster) -> tuple[dict[int, XmlDeviceType], list[ProblemNotice]]:
     dir = _get_data_model_directory(data_model_directory, DataModelLevel.kDeviceType)
     device_types: dict[int, XmlDeviceType] = {}
     problems = []