diff --git a/data_model/clusters/BooleanStateConfiguration.xml b/data_model/clusters/BooleanStateConfiguration.xml
index dc17f93a7295f0..a9c370b95fe15c 100644
--- a/data_model/clusters/BooleanStateConfiguration.xml
+++ b/data_model/clusters/BooleanStateConfiguration.xml
@@ -104,7 +104,7 @@ Davis, CA 95616, USA
     </bitmap>
   </dataTypes>
   <attributes>
-    <attribute id="0x0000" name="CurrentSensitivityLevel" type="uint8">
+    <attribute id="0x0000" name="CurrentSensitivityLevel" type="uint8" default="MS">
       <access read="true" write="true" readPrivilege="view" writePrivilege="operate"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
       <mandatoryConform>
@@ -112,7 +112,7 @@ Davis, CA 95616, USA
       </mandatoryConform>
       <constraint type="max" value="SupportedSensitivityLevels - 1"/>
     </attribute>
-    <attribute id="0x0001" name="SupportedSensitivityLevels" type="uint8">
+    <attribute id="0x0001" name="SupportedSensitivityLevels" type="uint8" default="MS">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
       <mandatoryConform>
@@ -120,7 +120,7 @@ Davis, CA 95616, USA
       </mandatoryConform>
       <constraint type="between" from="2" to="10"/>
     </attribute>
-    <attribute id="0x0002" name="DefaultSensitivityLevel" type="uint8">
+    <attribute id="0x0002" name="DefaultSensitivityLevel" type="uint8" default="MS">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
       <optionalConform>
@@ -128,7 +128,7 @@ Davis, CA 95616, USA
       </optionalConform>
       <constraint type="max" value="SupportedSensitivityLevels - 1"/>
     </attribute>
-    <attribute id="0x0003" name="AlarmsActive" type="AlarmModeBitmap">
+    <attribute id="0x0003" name="AlarmsActive" type="AlarmModeBitmap" default="0">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <orTerm>
@@ -137,13 +137,13 @@ Davis, CA 95616, USA
         </orTerm>
       </mandatoryConform>
     </attribute>
-    <attribute id="0x0004" name="AlarmsSuppressed" type="AlarmModeBitmap">
+    <attribute id="0x0004" name="AlarmsSuppressed" type="AlarmModeBitmap" default="0">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform>
         <feature name="SPRS"/>
       </mandatoryConform>
     </attribute>
-    <attribute id="0x0005" name="AlarmsEnabled" type="AlarmModeBitmap">
+    <attribute id="0x0005" name="AlarmsEnabled" type="AlarmModeBitmap" default="MS">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
       <optionalConform>
@@ -153,7 +153,7 @@ Davis, CA 95616, USA
         </orTerm>
       </optionalConform>
     </attribute>
-    <attribute id="0x0006" name="AlarmsSupported" type="AlarmModeBitmap">
+    <attribute id="0x0006" name="AlarmsSupported" type="AlarmModeBitmap" default="0">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
       <mandatoryConform>
diff --git a/data_model/clusters/ColorControl.xml b/data_model/clusters/ColorControl.xml
index 14d471b78a3043..b913009f852761 100644
--- a/data_model/clusters/ColorControl.xml
+++ b/data_model/clusters/ColorControl.xml
@@ -107,7 +107,6 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0002" name="RemainingTime" type="uint16" default="0">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false"/>
       <optionalConform/>
       <constraint type="between" from="0" to="65534"/>
     </attribute>
diff --git a/data_model/clusters/DiagnosticsGeneral.xml b/data_model/clusters/DiagnosticsGeneral.xml
index 27046ded399425..1141123c83b6be 100644
--- a/data_model/clusters/DiagnosticsGeneral.xml
+++ b/data_model/clusters/DiagnosticsGeneral.xml
@@ -65,9 +65,7 @@ Davis, CA 95616, USA
   </clusterIds>
   <classification hierarchy="base" role="utility" picsCode="DGGEN" scope="Node"/>
   <features>
-    <feature bit="0" code="DMTEST" name="DataModelTest" summary="Support specific testing needs for extended Data Model features">
-      <optionalConform/>
-    </feature>
+    <feature bit="0" code="DMTEST" name="DataModelTest" summary="Support specific testing needs for extended Data Model features"/>
   </features>
   <dataTypes>
     <enum name="BootReasonEnum">
diff --git a/data_model/clusters/DoorLock.xml b/data_model/clusters/DoorLock.xml
index 6284b973eb63e1..16d26420fe2009 100644
--- a/data_model/clusters/DoorLock.xml
+++ b/data_model/clusters/DoorLock.xml
@@ -57,7 +57,7 @@ Davis, CA 95616, USA
 
 :xrefstyle: basic
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0101" name="Door Lock" revision="8">
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0101" name="Door Lock" revision="7">
   <revisionHistory>
     <revision revision="1" summary="Mandatory global ClusterRevision attribute added; CCB 1811 1812 1821"/>
     <revision revision="2" summary="CCB 2430"/>
@@ -66,7 +66,6 @@ Davis, CA 95616, USA
     <revision revision="5"/>
     <revision revision="6" summary="New data model format and notation. Added User features. General cleanup of functionality"/>
     <revision revision="7" summary="Added support for European door locks (unbolt feature)"/>
-    <revision revision="8" summary="Added support for Aliro credential provisioning"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0101" name="Door Lock"/>
@@ -104,19 +103,14 @@ Davis, CA 95616, USA
       <optionalConform/>
     </feature>
     <feature bit="8" code="USR" name="User" summary="Lock supports the user commands and database">
-      <otherwiseConform>
-        <mandatoryConform>
-          <feature name="ALIRO"/>
-        </mandatoryConform>
-        <optionalConform>
-          <orTerm>
-            <feature name="PIN"/>
-            <feature name="RID"/>
-            <feature name="FGP"/>
-            <feature name="FACE"/>
-          </orTerm>
-        </optionalConform>
-      </otherwiseConform>
+      <optionalConform>
+        <orTerm>
+          <feature name="PIN"/>
+          <feature name="RID"/>
+          <feature name="FGP"/>
+          <feature name="FACE"/>
+        </orTerm>
+      </optionalConform>
     </feature>
     <feature bit="9" code="NOT" name="Notification" summary="Operation and Programming Notifications">
       <optionalConform/>
@@ -130,14 +124,6 @@ Davis, CA 95616, USA
     <feature bit="12" code="UBOLT" name="Unbolting" summary="Lock supports unbolting">
       <optionalConform/>
     </feature>
-    <feature bit="13" code="ALIRO" name="AliroProvisioning" summary="Lock supports Aliro credential provisioning as defined in ref_Aliro">
-      <optionalConform/>
-    </feature>
-    <feature bit="14" code="ALBU" name="AliroBLEUWB" summary="Lock supports the Bluetooth LE + UWB Access Control Flow as defined in ref_Aliro">
-      <optionalConform>
-        <feature name="ALIRO"/>
-      </optionalConform>
-    </feature>
   </features>
   <dataTypes>
     <enum name="AlarmCodeEnum">
@@ -220,23 +206,6 @@ Davis, CA 95616, USA
           <feature name="FACE"/>
         </mandatoryConform>
       </item>
-      <item value="6" name="AliroCredentialIssuerKey" summary="A Credential Issuer public key as defined in ref_Aliro">
-        <mandatoryConform>
-          <feature name="ALIRO"/>
-        </mandatoryConform>
-      </item>
-      <item value="7" name="AliroEvictableEndpointKey" summary="An Endpoint public key as defined in ref_Aliro which can
-                            be evicted if space is needed for another endpoint key">
-        <mandatoryConform>
-          <feature name="ALIRO"/>
-        </mandatoryConform>
-      </item>
-      <item value="8" name="AliroNonEvictableEndpointKey" summary="An Endpoint public key as defined in ref_Aliro which cannot
-                            be evicted if space is needed for another endpoint key">
-        <mandatoryConform>
-          <feature name="ALIRO"/>
-        </mandatoryConform>
-      </item>
     </enum>
     <enum name="DataOperationTypeEnum">
       <item value="0" name="Add" summary="Data is being added or was added">
@@ -370,21 +339,6 @@ Davis, CA 95616, USA
           <feature name="FACE"/>
         </mandatoryConform>
       </item>
-      <item value="11" name="AliroCredentialIssuerKey" summary="An Aliro credential issuer key credential was added, cleared, or modified.">
-        <mandatoryConform>
-          <feature name="ALIRO"/>
-        </mandatoryConform>
-      </item>
-      <item value="12" name="AliroEvictableEndpointKey" summary="An Aliro endpoint key credential which can be evicted credential was added, cleared, or modified.">
-        <mandatoryConform>
-          <feature name="ALIRO"/>
-        </mandatoryConform>
-      </item>
-      <item value="13" name="AliroNonEvictableEndpointKey" summary="An Aliro endpoint key credential which cannot be evicted was added, cleared, or modified.">
-        <mandatoryConform>
-          <feature name="ALIRO"/>
-        </mandatoryConform>
-      </item>
     </enum>
     <enum name="LockOperationTypeEnum">
       <item value="0" name="Lock" summary="Lock operation">
@@ -533,11 +487,6 @@ Davis, CA 95616, USA
           <feature name="USR"/>
         </optionalConform>
       </item>
-      <item value="10" name="Aliro" summary="User change operation was a step-up credential provisioning as defined in ref_Aliro">
-        <mandatoryConform>
-          <feature name="ALIRO"/>
-        </mandatoryConform>
-      </item>
     </enum>
     <enum name="SoundVolumeEnum">
       <item value="0" name="Silent" summary="Silent Mode">
@@ -1109,81 +1058,6 @@ Davis, CA 95616, USA
         </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"/>
-      <mandatoryConform>
-        <feature name="ALIRO"/>
-      </mandatoryConform>
-      <constraint type="maxLength" value="65"/>
-    </attribute>
-    <attribute id="0x0081" name="AliroReaderGroupIdentifier" type="octstr" default="null">
-      <access read="true" readPrivilege="admin"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
-        <feature name="ALIRO"/>
-      </mandatoryConform>
-      <constraint type="maxLength" value="16"/>
-    </attribute>
-    <attribute id="0x0082" name="AliroReaderGroupSubIdentifier" type="octstr">
-      <access read="true" readPrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
-      <mandatoryConform>
-        <feature name="ALIRO"/>
-      </mandatoryConform>
-      <constraint type="maxLength" value="16"/>
-    </attribute>
-    <attribute id="0x0083" name="AliroExpeditedTransactionSupportedProtocolVersions" type="list" default="empty">
-      <entry type="octstr">
-        <constraint type="maxLength" value="2"/>
-      </entry>
-      <access read="true" readPrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
-      <mandatoryConform>
-        <feature name="ALIRO"/>
-      </mandatoryConform>
-      <constraint type="maxCount" value="16"/>
-    </attribute>
-    <attribute id="0x0084" name="AliroGroupResolvingKey" type="octstr" default="null">
-      <access read="true" readPrivilege="admin"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
-      <mandatoryConform>
-        <feature name="ALBU"/>
-      </mandatoryConform>
-      <constraint type="maxLength" value="16"/>
-    </attribute>
-    <attribute id="0x0085" name="AliroSupportedBLEUWBProtocolVersions" type="list" default="empty">
-      <entry type="octstr">
-        <constraint type="maxLength" value="2"/>
-      </entry>
-      <access read="true" readPrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
-      <mandatoryConform>
-        <feature name="ALBU"/>
-      </mandatoryConform>
-      <constraint type="maxCount" value="16"/>
-    </attribute>
-    <attribute id="0x0086" name="AliroBLEAdvertisingVersion" type="uint8" default="0">
-      <access read="true" readPrivilege="admin"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
-      <mandatoryConform>
-        <feature name="ALBU"/>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0087" name="NumberOfAliroCredentialIssuerKeysSupported" type="uint16" default="0">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
-      <mandatoryConform>
-        <feature name="ALIRO"/>
-      </mandatoryConform>
-    </attribute>
-    <attribute id="0x0088" name="NumberOfAliroEndpointKeysSupported" type="uint16" default="0">
-      <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
-      <mandatoryConform>
-        <feature name="ALIRO"/>
-      </mandatoryConform>
-    </attribute>
   </attributes>
   <commands>
     <command id="0x00" name="LockDoor" direction="commandToServer" response="Y">
@@ -2059,13 +1933,6 @@ Davis, CA 95616, USA
         <optionalConform/>
         <constraint type="desc"/>
       </field>
-      <field id="5" name="CredentialData" type="octstr">
-        <quality nullable="true"/>
-        <optionalConform>
-          <feature name="ALIRO"/>
-        </optionalConform>
-        <constraint type="desc"/>
-      </field>
     </command>
     <command id="0x26" name="ClearCredential" direction="commandToServer" response="Y">
       <access invokePrivilege="admin" timed="true"/>
@@ -2092,36 +1959,6 @@ Davis, CA 95616, USA
         </optionalConform>
       </field>
     </command>
-    <command id="0x28" name="SetAliroReaderConfig" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" timed="true"/>
-      <mandatoryConform>
-        <feature name="ALIRO"/>
-      </mandatoryConform>
-      <field id="0" name="SigningKey" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-      <field id="1" name="VerificationKey" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="65"/>
-      </field>
-      <field id="2" name="GroupIdentifier" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="16"/>
-      </field>
-      <field id="3" name="GroupResolvingKey" type="octstr">
-        <mandatoryConform>
-          <feature name="ALBU"/>
-        </mandatoryConform>
-        <constraint type="maxLength" value="16"/>
-      </field>
-    </command>
-    <command id="0x29" name="ClearAliroReaderConfig" direction="commandToServer" response="Y">
-      <access invokePrivilege="admin" timed="true"/>
-      <mandatoryConform>
-        <feature name="ALIRO"/>
-      </mandatoryConform>
-    </command>
   </commands>
   <events>
     <event id="0x00" name="DoorLockAlarm" priority="critical">
diff --git a/data_model/clusters/EnergyEVSE.xml b/data_model/clusters/EnergyEVSE.xml
index fa15692e78896d..d7786da5cda99d 100644
--- a/data_model/clusters/EnergyEVSE.xml
+++ b/data_model/clusters/EnergyEVSE.xml
@@ -68,7 +68,7 @@ Davis, CA 95616, USA
   <classification hierarchy="base" role="application" picsCode="EEVSE" scope="Endpoint"/>
   <features>
     <feature bit="0" code="PREF" name="ChargingPreferences" summary="EVSE supports storing user charging preferences">
-      <optionalConform/>
+      <provisionalConform/>
     </feature>
     <feature bit="1" code="SOC" name="SoCReporting" summary="EVSE supports reporting of vehicle State of Charge (SoC)">
       <provisionalConform/>
diff --git a/data_model/clusters/ICDManagement.xml b/data_model/clusters/ICDManagement.xml
index 95cc2b5b63cff8..534b8340143083 100644
--- a/data_model/clusters/ICDManagement.xml
+++ b/data_model/clusters/ICDManagement.xml
@@ -91,9 +91,6 @@ Davis, CA 95616, USA
         <optionalConform/>
       </otherwiseConform>
     </feature>
-    <feature bit="2" code="LITS" name="LongIdleTimeSupport" summary="Device supports operating as a Long Idle Time ICD.">
-      <optionalConform/>
-    </feature>
   </features>
   <dataTypes>
     <number name="UserActiveModeTriggerBitmap" type=""/>
diff --git a/data_model/clusters/LevelControl.xml b/data_model/clusters/LevelControl.xml
index 13522bf0698b9e..5cacf7e89a5162 100644
--- a/data_model/clusters/LevelControl.xml
+++ b/data_model/clusters/LevelControl.xml
@@ -79,8 +79,8 @@ Davis, CA 95616, USA
       <optionalConform/>
     </feature>
     <feature bit="2" code="FQ" name="Frequency" default="0" summary="Supports frequency attributes and behavior.
-                                      The Pulse Width Modulation cluster was created
-                                      for frequency control.">
+                                                    The Pulse Width Modulation cluster was created
+                                                    for frequency control.">
       <provisionalConform/>
     </feature>
   </features>
@@ -126,7 +126,6 @@ Davis, CA 95616, USA
     </attribute>
     <attribute id="0x0001" name="RemainingTime" type="uint16" default="0">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="false" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform>
         <feature name="LT"/>
       </mandatoryConform>
diff --git a/data_model/clusters/Messages.xml b/data_model/clusters/Messages.xml
index 3d2c34cacc89b7..61f21bef9c95f3 100644
--- a/data_model/clusters/Messages.xml
+++ b/data_model/clusters/Messages.xml
@@ -212,7 +212,7 @@ Davis, CA 95616, USA
         <quality nullable="true"/>
         <mandatoryConform/>
       </field>
-      <field id="4" name="Duration" type="uint16" default="0">
+      <field id="4" name="Duration" type="uint64" default="0">
         <access fabricSensitive="true"/>
         <quality nullable="true"/>
         <mandatoryConform/>
diff --git a/data_model/clusters/MicrowaveOvenControl.xml b/data_model/clusters/MicrowaveOvenControl.xml
index d7c6f72f740d3d..27f31dcba966b7 100644
--- a/data_model/clusters/MicrowaveOvenControl.xml
+++ b/data_model/clusters/MicrowaveOvenControl.xml
@@ -70,7 +70,10 @@ Davis, CA 95616, USA
       <optionalConform choice="a"/>
     </feature>
     <feature bit="1" code="WATTS" name="PowerInWatts" summary="Power is specified in Watts">
-      <optionalConform choice="a"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform choice="a"/>
+      </otherwiseConform>
     </feature>
     <feature bit="2" code="PWRLMTS" name="PowerNumberLimits" summary="Supports the limit attributes used with the PWRNUM feature">
       <optionalConform>
@@ -125,16 +128,22 @@ Davis, CA 95616, USA
       <entry type="uint16"/>
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
-      <mandatoryConform>
-        <feature name="WATTS"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="WATTS"/>
+        </mandatoryConform>
+      </otherwiseConform>
       <constraint type="countBetween" from="1" to="10"/>
     </attribute>
     <attribute id="0x0007" name="SelectedWattIndex" type="uint8" default="MS">
       <access read="true" readPrivilege="view"/>
-      <mandatoryConform>
-        <feature name="WATTS"/>
-      </mandatoryConform>
+      <otherwiseConform>
+        <provisionalConform/>
+        <mandatoryConform>
+          <feature name="WATTS"/>
+        </mandatoryConform>
+      </otherwiseConform>
       <constraint type="desc"/>
     </attribute>
     <attribute id="0x0008" name="WattRating" type="uint16" default="MS">
@@ -165,7 +174,7 @@ Davis, CA 95616, USA
         <optionalConform choice="a" more="true">
           <feature name="WATTS"/>
         </optionalConform>
-        <constraint type="between" from="0" to="len(SupportedWatts)-1"/>
+        <constraint type="desc"/>
       </field>
       <field id="4" name="StartAfterSetting" type="bool" default="false">
         <optionalConform/>
diff --git a/data_model/clusters/Mode_RVCClean.xml b/data_model/clusters/Mode_RVCClean.xml
index d1b2272fc7e756..0738d20c0c23dd 100644
--- a/data_model/clusters/Mode_RVCClean.xml
+++ b/data_model/clusters/Mode_RVCClean.xml
@@ -66,20 +66,6 @@ Davis, CA 95616, USA
     <clusterId id="0x0055" name="RVC Clean Mode"/>
   </clusterIds>
   <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="RVCCLEANM" scope="Endpoint"/>
-  <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">
-      <deprecateConform/>
-    </attribute>
-  </attributes>
   <dataTypes>
     <struct name="ModeOptionStruct">
       <field id="0" name="Label">
@@ -94,4 +80,18 @@ Davis, CA 95616, USA
       </field>
     </struct>
   </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <deprecateConform/>
+    </attribute>
+  </attributes>
 </cluster>
\ No newline at end of file
diff --git a/data_model/clusters/Mode_RVCRun.xml b/data_model/clusters/Mode_RVCRun.xml
index 8e19b45a8385fc..b5811a0a6cfe05 100644
--- a/data_model/clusters/Mode_RVCRun.xml
+++ b/data_model/clusters/Mode_RVCRun.xml
@@ -66,20 +66,6 @@ Davis, CA 95616, USA
     <clusterId id="0x0054" name="RVC Run Mode"/>
   </clusterIds>
   <classification hierarchy="derived" baseCluster="Mode Base" role="application" picsCode="RVCRUNM" scope="Endpoint"/>
-  <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">
-      <deprecateConform/>
-    </attribute>
-  </attributes>
   <dataTypes>
     <struct name="ModeOptionStruct">
       <field id="0" name="Label">
@@ -94,4 +80,18 @@ Davis, CA 95616, USA
       </field>
     </struct>
   </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="SupportedModes">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="CurrentMode">
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0002" name="StartUpMode">
+      <disallowConform/>
+    </attribute>
+    <attribute id="0x0003" name="OnMode">
+      <deprecateConform/>
+    </attribute>
+  </attributes>
 </cluster>
\ No newline at end of file
diff --git a/data_model/clusters/NetworkCommissioningCluster.xml b/data_model/clusters/NetworkCommissioningCluster.xml
index 86c7a01ce9f951..f9810212a79659 100644
--- a/data_model/clusters/NetworkCommissioningCluster.xml
+++ b/data_model/clusters/NetworkCommissioningCluster.xml
@@ -54,13 +54,11 @@ 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
-
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0031" name="Network Commissioning" revision="2">
   <revisionHistory>
     <revision revision="1" summary="Initial Release"/>
-    <revision revision="2" summary="Support determining capabilities for Wi-Fi and Thread interfaces. Additional Wi-Fi directed scanning requirements.
-Added support for Wi-Fi Per-Device Credentials (PDC feature; QueryIdentity and QueryIdentityResponse commands; PDC-related fields in commands)."/>
+    <revision revision="2" summary="Support determining capabilities for Wi-Fi and Thread interfaces. Additional Wi-Fi directed scanning requirements."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0031" name="Network Commissioning"/>
@@ -76,11 +74,6 @@ Added support for Wi-Fi Per-Device Credentials (PDC feature; QueryIdentity and Q
     <feature bit="2" code="ET" name="EthernetNetworkInterface" summary="Ethernet related features">
       <optionalConform choice="a"/>
     </feature>
-    <feature bit="3" code="PDC" name="PerDeviceCredentials" summary="Wi-Fi Per-Device Credentials">
-      <mandatoryConform>
-        <feature name="WI"/>
-      </mandatoryConform>
-    </feature>
   </features>
   <dataTypes>
     <enum name="NetworkCommissioningStatusEnum">
@@ -177,9 +170,6 @@ Added support for Wi-Fi Per-Device Credentials (PDC feature; QueryIdentity and Q
       <bitfield name="WPA3" bit="4" summary="Supports Wi-Fi using WPA3-Personal security">
         <mandatoryConform/>
       </bitfield>
-      <bitfield name="WPA3" bit="5" summary="Supports Wi-Fi using Per-Device Credentials">
-        <mandatoryConform/>
-      </bitfield>
     </bitmap>
     <struct name="NetworkInfoStruct">
       <field id="0" name="NetworkID" type="octstr">
@@ -189,22 +179,6 @@ Added support for Wi-Fi Per-Device Credentials (PDC feature; QueryIdentity and Q
       <field id="1" name="Connected" type="bool">
         <mandatoryConform/>
       </field>
-      <field id="2" name="NetworkIdentifier" type="octstr" default="null">
-        <quality nullable="true"/>
-        <mandatoryConform>
-          <feature name="PDC"/>
-        </mandatoryConform>
-        <constraint type="maxLength" value="20"/>
-        <constraint type="desc"/>
-      </field>
-      <field id="3" name="ClientIdentifier" type="octstr" default="null">
-        <quality nullable="true"/>
-        <mandatoryConform>
-          <feature name="PDC"/>
-        </mandatoryConform>
-        <constraint type="maxLength" value="20"/>
-        <constraint type="desc"/>
-      </field>
     </struct>
     <struct name="ThreadInterfaceScanResultStruct">
       <field id="0" name="PanId" type="uint16">
@@ -431,18 +405,6 @@ Added support for Wi-Fi Per-Device Credentials (PDC feature; QueryIdentity and Q
       <field id="2" name="Breadcrumb" type="uint64">
         <optionalConform/>
       </field>
-      <field id="3" name="NetworkIdentity" type="octstr">
-        <optionalConform>
-          <feature name="PDC"/>
-        </optionalConform>
-        <constraint type="maxLength" value="140"/>
-      </field>
-      <field id="4" name="ClientIdentifier" type="octstr">
-        <constraint type="maxLength" value="20"/>
-      </field>
-      <field id="5" name="PossessionNonce" type="octstr">
-        <constraint type="maxLength" value="32"/>
-      </field>
     </command>
     <command id="0x03" name="AddOrUpdateThreadNetwork" direction="commandToServer" response="NetworkConfigResponse">
       <access invokePrivilege="admin"/>
@@ -492,18 +454,6 @@ Added support for Wi-Fi Per-Device Credentials (PDC feature; QueryIdentity and Q
         <optionalConform/>
         <constraint type="between" from="0" to="MaxNetworks - 1"/>
       </field>
-      <field id="3" name="ClientIdentity" type="octstr">
-        <optionalConform>
-          <feature name="PDC"/>
-        </optionalConform>
-        <constraint type="maxLength" value="140"/>
-      </field>
-      <field id="4" name="PossessionSignature" type="octstr">
-        <optionalConform>
-          <feature name="PDC"/>
-        </optionalConform>
-        <constraint type="maxLength" value="64"/>
-      </field>
     </command>
     <command id="0x06" name="ConnectNetwork" direction="commandToServer" response="ConnectNetworkResponse">
       <access invokePrivilege="admin"/>
@@ -559,32 +509,5 @@ Added support for Wi-Fi Per-Device Credentials (PDC feature; QueryIdentity and Q
         <optionalConform/>
       </field>
     </command>
-    <command id="0x09" name="QueryIdentity" direction="commandToServer" response="QueryIdentityResponse">
-      <access invokePrivilege="admin"/>
-      <mandatoryConform>
-        <feature name="PDC"/>
-      </mandatoryConform>
-      <field id="0" name="KeyIdentifier" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="20"/>
-      </field>
-      <field id="1" name="PossessionNonce" type="octstr">
-        <optionalConform/>
-        <constraint type="maxLength" value="32"/>
-      </field>
-    </command>
-    <command id="0x0A" name="QueryIdentityResponse" direction="responseFromServer">
-      <mandatoryConform>
-        <feature name="PDC"/>
-      </mandatoryConform>
-      <field id="0" name="Identity" type="octstr">
-        <mandatoryConform/>
-        <constraint type="maxLength" value="140"/>
-      </field>
-      <field id="1" name="PossessionSignature" type="octstr">
-        <optionalConform/>
-        <constraint type="maxLength" value="64"/>
-      </field>
-    </command>
   </commands>
-</cluster>
+</cluster>
\ No newline at end of file
diff --git a/data_model/clusters/OperationalState.xml b/data_model/clusters/OperationalState.xml
index 37dc6b6e2f8cf4..98990eac3ded4d 100644
--- a/data_model/clusters/OperationalState.xml
+++ b/data_model/clusters/OperationalState.xml
@@ -203,7 +203,10 @@ Davis, CA 95616, USA
     </event>
     <event id="0x01" name="OperationCompletion" priority="info">
       <access readPrivilege="view"/>
-      <optionalConform/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
       <field id="0" name="CompletionErrorCode" type="enum8">
         <mandatoryConform/>
       </field>
diff --git a/data_model/clusters/OperationalState_RVC.xml b/data_model/clusters/OperationalState_RVC.xml
index 6426e2639a7b83..7e37a6b5f6f01b 100644
--- a/data_model/clusters/OperationalState_RVC.xml
+++ b/data_model/clusters/OperationalState_RVC.xml
@@ -66,21 +66,6 @@ Davis, CA 95616, USA
     <clusterId id="0x0061" name="RVC Operational State"/>
   </clusterIds>
   <classification hierarchy="derived" baseCluster="Operational State" role="application" picsCode="RVCOPSTATE" scope="Endpoint"/>
-  <commands>
-    <command id="0x00" name="Pause"/>
-    <command id="0x01" name="Stop">
-      <deprecateConform/>
-    </command>
-    <command id="0x02" name="Start">
-      <deprecateConform/>
-    </command>
-    <command id="0x03" name="Resume"/>
-    <command id="0x04" name="OperationalCommandResponse"/>
-    <command id="0x80" name="GoHome" direction="commandToServer" response="OperationalCommandResponse">
-      <access invokePrivilege="operate"/>
-      <optionalConform/>
-    </command>
-  </commands>
   <dataTypes>
     <enum name="ErrorStateEnum">
       <item value="0x40" name="FailedToFindChargingDock" summary="The device has failed to find or reach the charging dock">
@@ -120,4 +105,22 @@ Davis, CA 95616, USA
       </item>
     </enum>
   </dataTypes>
+  <commands>
+    <command id="0x00" name="Pause"/>
+    <command id="0x01" name="Stop">
+      <deprecateConform/>
+    </command>
+    <command id="0x02" name="Start">
+      <deprecateConform/>
+    </command>
+    <command id="0x03" name="Resume"/>
+    <command id="0x04" name="OperationalCommandResponse"/>
+    <command id="0x80" name="GoHome" direction="commandToServer" response="OperationalCommandResponse">
+      <access invokePrivilege="operate"/>
+      <otherwiseConform>
+        <provisionalConform/>
+        <optionalConform/>
+      </otherwiseConform>
+    </command>
+  </commands>
 </cluster>
\ No newline at end of file
diff --git a/data_model/clusters/PowerTopology.xml b/data_model/clusters/PowerTopology.xml
index d8c8a50d22a3a6..dac690fdcc465d 100644
--- a/data_model/clusters/PowerTopology.xml
+++ b/data_model/clusters/PowerTopology.xml
@@ -54,8 +54,6 @@ This notice and disclaimer must be included on all copies of this document.
 Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
-
-:xrefstyle: short
 -->
 <cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x009C" name="Power Topology" revision="1">
   <revisionHistory>
diff --git a/data_model/clusters/Scenes.xml b/data_model/clusters/Scenes.xml
index 5d9be300d1abbc..d9c0ee76fe37d2 100644
--- a/data_model/clusters/Scenes.xml
+++ b/data_model/clusters/Scenes.xml
@@ -121,14 +121,17 @@ Davis, CA 95616, USA
       </field>
       <field id="1" name="SceneID" type="uint8">
         <mandatoryConform/>
+        <constraint type="max" value="254"/>
       </field>
       <field id="2" name="SceneName" type="string">
         <mandatoryConform>
           <feature name="SN"/>
         </mandatoryConform>
+        <constraint type="maxLength" value="16"/>
       </field>
       <field id="3" name="SceneTransitionTime" type="uint32" default="0">
         <mandatoryConform/>
+        <constraint type="max" value="60000000"/>
       </field>
       <field id="4" name="ExtensionFields" type="list" default="empty">
         <entry type="ExtensionFieldSetStruct"/>
diff --git a/data_model/clusters/TimeSync.xml b/data_model/clusters/TimeSync.xml
index c6c57ece628bbd..68e98a1bf427fe 100644
--- a/data_model/clusters/TimeSync.xml
+++ b/data_model/clusters/TimeSync.xml
@@ -92,7 +92,7 @@ Davis, CA 95616, USA
       <item value="2" name="SecondsGranularity" summary="This indicates the node is synchronized to an upstream source using a low resolution protocol. UTC Time is accurate to ± 5 seconds.">
         <mandatoryConform/>
       </item>
-      <item value="3" name="MillisecondsGranularity" summary="This indicates the node is synchronized to an upstream source using high resolution time-synchronization protocol such as NTP, or has built-in GNSS with some amount of jitter applying its GNSS timestamp. UTC Time is accurate to ± 50ms.">
+      <item value="3" name="MillisecondsGranularity" summary="This indicates the node is synchronized to an upstream source using high resolution time-synchronization protocol such as NTP, or has built-in GNSS with some amount of jitter applying its GNSS timestamp. UTC Time is accurate to ± 50 ms.">
         <mandatoryConform/>
       </item>
       <item value="4" name="MicrosecondsGranularity" summary="This indicates the node is synchronized to an upstream source using a highly precise time-synchronization protocol such as PTP, or has built-in GNSS. UTC time is accurate to ± 10 μs.">
diff --git a/data_model/clusters/cluster_ids.json b/data_model/clusters/cluster_ids.json
new file mode 100644
index 00000000000000..be7c9464690ea8
--- /dev/null
+++ b/data_model/clusters/cluster_ids.json
@@ -0,0 +1,115 @@
+{
+    "3": "Identify",
+    "4": "Groups",
+    "6": "On/Off",
+    "8": "Level Control",
+    "28": "Pulse Width Modulation",
+    "29": "Descriptor",
+    "30": "Binding",
+    "31": "AccessControl",
+    "37": "Actions",
+    "40": "Basic Information",
+    "41": "OTA Software Update Provider",
+    "42": "OTA Software Update Requestor",
+    "43": "Localization Configuration",
+    "44": "Time Format Localization",
+    "45": "Unit Localization",
+    "46": "Power Source Configuration",
+    "47": "Power Source",
+    "48": "General Commissioning",
+    "49": "Network Commissioning",
+    "50": "Diagnostic Logs",
+    "51": "General Diagnostics",
+    "52": "Software Diagnostics",
+    "53": "Thread Network Diagnostics",
+    "54": "Wi",
+    "55": "Ethernet Network Diagnostics",
+    "56": "Time Synchronization",
+    "57": "Bridged Device Basic Information",
+    "59": "Switch",
+    "60": "Administrator Commissioning",
+    "62": "Operational Credentials",
+    "63": "GroupKeyManagement",
+    "64": "Fixed Label",
+    "65": "User Label",
+    "69": "Boolean State",
+    "70": "ICDManagement",
+    "72": "Oven Cavity Operational State",
+    "73": "Oven Mode",
+    "74": "Laundry Dryer Controls",
+    "80": "Mode Select",
+    "81": "Laundry Washer Mode",
+    "82": "Refrigerator And Temperature Controlled Cabinet Mode",
+    "83": "Laundry Washer Controls",
+    "84": "RVC Run Mode",
+    "85": "RVC Clean Mode",
+    "86": "Temperature Control",
+    "87": "Refrigerator Alarm",
+    "89": "Dishwasher Mode",
+    "91": "Air Quality",
+    "92": "Smoke CO Alarm",
+    "93": "Dishwasher Alarm",
+    "94": "Microwave Oven Mode",
+    "95": "Microwave Oven Control",
+    "96": "Operational State",
+    "97": "RVC Operational State",
+    "98": "Scenes Management",
+    "113": "HEPA Filter Monitoring",
+    "114": "Activated Carbon Filter Monitoring",
+    "128": "Boolean State Configuration",
+    "129": "Valve Configuration and Control",
+    "144": "Electrical Power Measurement",
+    "145": "Electrical Energy Measurement",
+    "148": "Water Heater Management",
+    "149": "Energy Price",
+    "150": "Demand Response and Load Control",
+    "151": "Messages",
+    "152": "Device Energy Management",
+    "153": "Energy EVSE",
+    "154": "Energy Calendar",
+    "155": "Energy Preference",
+    "156": "Power Topology",
+    "157": "Energy EVSE Mode",
+    "158": "Water Heater Mode",
+    "159": "Device Energy Management Mode",
+    "257": "Door Lock",
+    "258": "Window Covering",
+    "512": "Pump Configuration and Control",
+    "513": "Thermostat",
+    "514": "Fan Control",
+    "516": "Thermostat User Interface Configuration",
+    "768": "Color Control",
+    "769": "Ballast Configuration",
+    "1024": "Illuminance Measurement",
+    "1026": "Temperature Measurement",
+    "1027": "Pressure Measurement",
+    "1028": "Flow Measurement",
+    "1029": "Relative Humidity Measurement",
+    "1030": "Occupancy Sensing",
+    "1036": "Carbon Monoxide Concentration Measurement",
+    "1037": "Carbon Dioxide Concentration Measurement",
+    "1043": "Nitrogen Dioxide Concentration Measurement",
+    "1045": "Ozone Concentration Measurement",
+    "1066": "PM2",
+    "1067": "Formaldehyde Concentration Measurement",
+    "1068": "PM1 Concentration Measurement",
+    "1069": "PM10 Concentration Measurement",
+    "1070": "Total Volatile Organic Compounds Concentration Measurement",
+    "1071": "Radon Concentration Measurement",
+    "1104": "Network Identity Management",
+    "1105": "Wi",
+    "1283": "Wake on LAN",
+    "1284": "Channel",
+    "1285": "Target Navigator",
+    "1286": "Media Playback",
+    "1287": "Media Input",
+    "1288": "Low Power",
+    "1289": "Keypad Input",
+    "1290": "Content Launcher",
+    "1291": "Audio Output",
+    "1292": "Application Launcher",
+    "1293": "Application Basic",
+    "1294": "Account Login",
+    "1295": "Content Control",
+    "1296": "Content App Observer"
+}
diff --git a/data_model/clusters/network_infrastructure.xml b/data_model/clusters/network_infrastructure.xml
index 7e75cc0af8229f..8045740d5de0b6 100644
--- a/data_model/clusters/network_infrastructure.xml
+++ b/data_model/clusters/network_infrastructure.xml
@@ -58,5 +58,7 @@ 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
+
+:toc:
 -->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Network Infrastructure" revision=""/>
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="" name="Network Infrastructure" revision=""/>
\ No newline at end of file
diff --git a/data_model/device_types/Aggregator.xml b/data_model/device_types/Aggregator.xml
index 4e0eb1cee512c3..48aa4347d850e1 100644
--- a/data_model/device_types/Aggregator.xml
+++ b/data_model/device_types/Aggregator.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/device_types/BaseDeviceType.xml b/data_model/device_types/BaseDeviceType.xml
index 0df3ba00d26e2b..ddcc49f258f0cb 100644
--- a/data_model/device_types/BaseDeviceType.xml
+++ b/data_model/device_types/BaseDeviceType.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
     <revision revision="2" summary="Duplicate condition replaces Multiple condition"/>
   </revisionHistory>
@@ -66,7 +65,7 @@ Davis, CA 95616, USA
     <cluster id="0x001D" name="Descriptor" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="TAGLIST">
+        <feature code="" name="TagList">
           <mandatoryConform>
             <attribute name="Duplicate"/>
           </mandatoryConform>
diff --git a/data_model/device_types/BasicVideoPlayer.xml b/data_model/device_types/BasicVideoPlayer.xml
index 2b9b52c3b43ee6..ed82d08bc7a112 100644
--- a/data_model/device_types/BasicVideoPlayer.xml
+++ b/data_model/device_types/BasicVideoPlayer.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
     <revision revision="2" summary="Added Messages and Content Control clusters"/>
   </revisionHistory>
diff --git a/data_model/device_types/BridgedNode.xml b/data_model/device_types/BridgedNode.xml
index 29b7a59299c37b..59414205c052b5 100644
--- a/data_model/device_types/BridgedNode.xml
+++ b/data_model/device_types/BridgedNode.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
     <revision revision="2" summary="Added Power Source to device type; Deprecated Power Source Configuration"/>
   </revisionHistory>
diff --git a/data_model/device_types/CastingVideoClient.xml b/data_model/device_types/CastingVideoClient.xml
index d79506b9cf66a0..8f816b3e2a8056 100644
--- a/data_model/device_types/CastingVideoClient.xml
+++ b/data_model/device_types/CastingVideoClient.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
     <revision revision="2" summary="Added Content App Observer, Messages and Content Control Clusters"/>
   </revisionHistory>
diff --git a/data_model/device_types/CastingVideoPlayer.xml b/data_model/device_types/CastingVideoPlayer.xml
index 336416508660a8..0b65f4f7aab57d 100644
--- a/data_model/device_types/CastingVideoPlayer.xml
+++ b/data_model/device_types/CastingVideoPlayer.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
     <revision revision="2" summary="Added Messages and Content Control clusters"/>
   </revisionHistory>
@@ -109,7 +108,7 @@ launch Content Apps and represent these apps as separate endpoints."/>
         <attribute name="ContentAppPlatform"/>
       </mandatoryConform>
       <features>
-        <feature code="" name="Application">
+        <feature code="" name="ApplicationPlatform">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/ColorDimmerSwitch.xml b/data_model/device_types/ColorDimmerSwitch.xml
index 0da15b82a2cd08..e391700918e1c4 100644
--- a/data_model/device_types/ColorDimmerSwitch.xml
+++ b/data_model/device_types/ColorDimmerSwitch.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
diff --git a/data_model/device_types/ColorTemperatureLight.xml b/data_model/device_types/ColorTemperatureLight.xml
index 5a54a36a7a0fbf..e782dd24f58f4f 100644
--- a/data_model/device_types/ColorTemperatureLight.xml
+++ b/data_model/device_types/ColorTemperatureLight.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Added optional occupancy sensing"/>
@@ -80,7 +79,7 @@ Davis, CA 95616, USA
     <cluster id="0x0006" name="On/Off" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
       </features>
@@ -88,10 +87,10 @@ Davis, CA 95616, USA
     <cluster id="0x0008" name="Level Control" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="OO">
+        <feature code="" name="OnOff">
           <mandatoryConform/>
         </feature>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
       </features>
@@ -118,7 +117,7 @@ Davis, CA 95616, USA
     <cluster id="0x0300" name="Color Control" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="CT">
+        <feature code="" name="ColorTemperature">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/ContentApp.xml b/data_model/device_types/ContentApp.xml
index 84bf58698f426d..300e3122336ef4 100644
--- a/data_model/device_types/ContentApp.xml
+++ b/data_model/device_types/ContentApp.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
     <revision revision="2" summary="Added Content App Observer cluster"/>
   </revisionHistory>
@@ -86,7 +85,7 @@ Davis, CA 95616, USA
     <cluster id="0x050C" name="Application Launcher" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="Application">
+        <feature code="" name="ApplicationPlatform">
           <disallowConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/ControlBridge.xml b/data_model/device_types/ControlBridge.xml
index f427becc14f791..27e00f69403728 100644
--- a/data_model/device_types/ControlBridge.xml
+++ b/data_model/device_types/ControlBridge.xml
@@ -57,8 +57,6 @@ 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="0" summary="Revision is zero before revision numbers are defined and is
-required."/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
diff --git a/data_model/device_types/CookSurface.xml b/data_model/device_types/CookSurface.xml
index b18897b3f0f9ff..a32425e2f1df08 100644
--- a/data_model/device_types/CookSurface.xml
+++ b/data_model/device_types/CookSurface.xml
@@ -65,7 +65,7 @@ Davis, CA 95616, USA
     <cluster id="0x0006" name="On/Off" side="server">
       <optionalConform/>
       <features>
-        <feature code="" name="OFFONLY">
+        <feature code="" name="OffOnly">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/DimmableLight.xml b/data_model/device_types/DimmableLight.xml
index ce0c280de6f0a6..ec66b81a610451 100644
--- a/data_model/device_types/DimmableLight.xml
+++ b/data_model/device_types/DimmableLight.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
@@ -79,7 +78,7 @@ Davis, CA 95616, USA
     <cluster id="0x0006" name="On/Off" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
       </features>
@@ -87,10 +86,10 @@ Davis, CA 95616, USA
     <cluster id="0x0008" name="Level Control" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
-        <feature code="" name="OO">
+        <feature code="" name="OnOff">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/DimmablePlug-InUnit.xml b/data_model/device_types/DimmablePlug-InUnit.xml
index 98895640fe1bc5..bbd043912ab6d7 100644
--- a/data_model/device_types/DimmablePlug-InUnit.xml
+++ b/data_model/device_types/DimmablePlug-InUnit.xml
@@ -57,7 +57,6 @@ 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" revision="4">
   <revisionHistory>
-    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Added optional occupancy sensing"/>
@@ -80,7 +79,7 @@ Davis, CA 95616, USA
     <cluster id="0x0006" name="On/Off" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
       </features>
@@ -88,10 +87,10 @@ Davis, CA 95616, USA
     <cluster id="0x0008" name="Level Control" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="OO">
+        <feature code="" name="OnOff">
           <mandatoryConform/>
         </feature>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/DimmerSwitch.xml b/data_model/device_types/DimmerSwitch.xml
index 137adfd9117cf7..008e54eee8efc3 100644
--- a/data_model/device_types/DimmerSwitch.xml
+++ b/data_model/device_types/DimmerSwitch.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
diff --git a/data_model/device_types/Dishwasher.xml b/data_model/device_types/Dishwasher.xml
index a07fdc9c3adddb..6e351f38360e4e 100644
--- a/data_model/device_types/Dishwasher.xml
+++ b/data_model/device_types/Dishwasher.xml
@@ -68,7 +68,7 @@ Davis, CA 95616, USA
     <cluster id="0x0006" name="On/Off" side="server">
       <optionalConform/>
       <features>
-        <feature code="" name="DF">
+        <feature code="" name="DeadFrontBehavior">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/DoorLock.xml b/data_model/device_types/DoorLock.xml
index 9b6c7fd145621d..8b73bbf8679a6b 100644
--- a/data_model/device_types/DoorLock.xml
+++ b/data_model/device_types/DoorLock.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="Initial Matter release"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
@@ -77,7 +76,7 @@ Davis, CA 95616, USA
     <cluster id="0x0101" name="Door Lock" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="USR">
+        <feature code="" name="User">
           <mandatoryConform>
             <andTerm>
               <condition name="Matter"/>
@@ -90,7 +89,7 @@ Davis, CA 95616, USA
             </andTerm>
           </mandatoryConform>
         </feature>
-        <feature code="" name="RID">
+        <feature code="" name="RFIDCredential">
           <otherwiseConform>
             <provisionalConform/>
             <optionalConform/>
diff --git a/data_model/device_types/DoorLockController.xml b/data_model/device_types/DoorLockController.xml
index 0279f0100a5fc0..30342b95a126bd 100644
--- a/data_model/device_types/DoorLockController.xml
+++ b/data_model/device_types/DoorLockController.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="Initial Matter release"/>
     <revision revision="3" summary="Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
diff --git a/data_model/device_types/EnergyTariffCalendar.xml b/data_model/device_types/EnergyTariffCalendar.xml
index 7b0becfc52e1c9..ee3a6b9347db38 100644
--- a/data_model/device_types/EnergyTariffCalendar.xml
+++ b/data_model/device_types/EnergyTariffCalendar.xml
@@ -55,9 +55,9 @@ 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="0x050B" name="Energy Tariff Calendar" revision="0">
+<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="0" summary="Initial Matter release"/>
+    <revision revision="1" summary="Initial Matter release"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
diff --git a/data_model/device_types/ExtendedColorLight.xml b/data_model/device_types/ExtendedColorLight.xml
index 97cb3eaf66377c..75988addc3f8cd 100644
--- a/data_model/device_types/ExtendedColorLight.xml
+++ b/data_model/device_types/ExtendedColorLight.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation; integrate DM CCB 3501"/>
     <revision revision="3" summary="Added optional occupancy sensing"/>
@@ -80,7 +79,7 @@ Davis, CA 95616, USA
     <cluster id="0x0006" name="On/Off" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
       </features>
@@ -88,10 +87,10 @@ Davis, CA 95616, USA
     <cluster id="0x0008" name="Level Control" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="OO">
+        <feature code="" name="OnOff">
           <mandatoryConform/>
         </feature>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
       </features>
@@ -118,19 +117,19 @@ Davis, CA 95616, USA
     <cluster id="0x0300" name="Color Control" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="HS">
+        <feature code="" name="HueSaturation">
           <optionalConform/>
         </feature>
-        <feature code="" name="EHUE">
+        <feature code="" name="EnhancedHue">
           <optionalConform/>
         </feature>
-        <feature code="" name="CL">
+        <feature code="" name="ColorLoop">
           <optionalConform/>
         </feature>
         <feature code="" name="XY">
           <mandatoryConform/>
         </feature>
-        <feature code="" name="CT">
+        <feature code="" name="ColorTemperature">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/FlowSensor.xml b/data_model/device_types/FlowSensor.xml
index 8c604586481536..bcc27b318aac36 100644
--- a/data_model/device_types/FlowSensor.xml
+++ b/data_model/device_types/FlowSensor.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation"/>
   </revisionHistory>
diff --git a/data_model/device_types/GenericSwitch.xml b/data_model/device_types/GenericSwitch.xml
index e381914be42921..acfa0a95005291 100644
--- a/data_model/device_types/GenericSwitch.xml
+++ b/data_model/device_types/GenericSwitch.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
     <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"/>
diff --git a/data_model/device_types/HumiditySensor.xml b/data_model/device_types/HumiditySensor.xml
index d59ed7caf43abe..4a1808d7e0c580 100644
--- a/data_model/device_types/HumiditySensor.xml
+++ b/data_model/device_types/HumiditySensor.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Zigbee 3.0"/>
     <revision revision="2" summary="New data model format and notation"/>
   </revisionHistory>
diff --git a/data_model/device_types/LaundryDryer.xml b/data_model/device_types/LaundryDryer.xml
index 78f9383800ad8c..d4692c7ad818a5 100644
--- a/data_model/device_types/LaundryDryer.xml
+++ b/data_model/device_types/LaundryDryer.xml
@@ -68,7 +68,7 @@ Davis, CA 95616, USA
     <cluster id="0x0006" name="On/Off" side="server">
       <optionalConform/>
       <features>
-        <feature code="" name="DF">
+        <feature code="" name="DeadFrontBehavior">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/LaundryWasher.xml b/data_model/device_types/LaundryWasher.xml
index f0f48212b8d062..03b85f3bd363b4 100644
--- a/data_model/device_types/LaundryWasher.xml
+++ b/data_model/device_types/LaundryWasher.xml
@@ -68,7 +68,7 @@ Davis, CA 95616, USA
     <cluster id="0x0006" name="On/Off" side="server">
       <optionalConform/>
       <features>
-        <feature code="" name="DF">
+        <feature code="" name="DeadFrontBehavior">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/LightSensor.xml b/data_model/device_types/LightSensor.xml
index 618901b398b5f8..0eca130f921623 100644
--- a/data_model/device_types/LightSensor.xml
+++ b/data_model/device_types/LightSensor.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation"/>
     <revision revision="3" summary="Restricting Groups client to Zigbee."/>
diff --git a/data_model/device_types/ModeSelectDeviceType.xml b/data_model/device_types/ModeSelectDeviceType.xml
index 748dc1bae2f0a3..7848ba0adc787f 100644
--- a/data_model/device_types/ModeSelectDeviceType.xml
+++ b/data_model/device_types/ModeSelectDeviceType.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/device_types/OccupancySensor.xml b/data_model/device_types/OccupancySensor.xml
index 1ac4e0ab937830..29213e43beb8f1 100644
--- a/data_model/device_types/OccupancySensor.xml
+++ b/data_model/device_types/OccupancySensor.xml
@@ -55,13 +55,11 @@ 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="0x0107" name="Occupancy Sensor" revision="4">
+<deviceType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd devicetype devicetype.xsd" id="0x0107" name="Occupancy Sensor" revision="3">
   <revisionHistory>
-    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditions/>
@@ -69,9 +67,6 @@ Davis, CA 95616, USA
     <cluster id="0x0003" name="Identify" side="server">
       <mandatoryConform/>
     </cluster>
-    <cluster id="0x0080" name="Boolean State Configuration" side="server">
-      <optionalConform/>
-    </cluster>
     <cluster id="0x0406" name="Occupancy Sensing" side="server">
       <mandatoryConform/>
     </cluster>
diff --git a/data_model/device_types/OnOffLight.xml b/data_model/device_types/OnOffLight.xml
index 59e8739cab0275..fe98ac6b6d7028 100644
--- a/data_model/device_types/OnOffLight.xml
+++ b/data_model/device_types/OnOffLight.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
@@ -79,7 +78,7 @@ Davis, CA 95616, USA
     <cluster id="0x0006" name="On/Off" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
       </features>
@@ -87,10 +86,10 @@ Davis, CA 95616, USA
     <cluster id="0x0008" name="Level Control" side="server">
       <optionalConform/>
       <features>
-        <feature code="" name="OO">
+        <feature code="" name="OffOnly">
           <mandatoryConform/>
         </feature>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/OnOffLightSwitch.xml b/data_model/device_types/OnOffLightSwitch.xml
index 9b9d72ba4f0964..9896264d5b9e4f 100644
--- a/data_model/device_types/OnOffLightSwitch.xml
+++ b/data_model/device_types/OnOffLightSwitch.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
diff --git a/data_model/device_types/OnOffPlug-inUnit.xml b/data_model/device_types/OnOffPlug-inUnit.xml
index 4b4f49725cf9fa..dbcb7f7e739629 100644
--- a/data_model/device_types/OnOffPlug-inUnit.xml
+++ b/data_model/device_types/OnOffPlug-inUnit.xml
@@ -57,7 +57,6 @@ 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" revision="3">
   <revisionHistory>
-    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
@@ -79,7 +78,7 @@ Davis, CA 95616, USA
     <cluster id="0x0006" name="On/Off" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
       </features>
@@ -87,10 +86,10 @@ Davis, CA 95616, USA
     <cluster id="0x0008" name="Level Control" side="server">
       <optionalConform/>
       <features>
-        <feature code="" name="OO">
+        <feature code="" name="OffOnly">
           <mandatoryConform/>
         </feature>
-        <feature code="" name="LT">
+        <feature code="" name="Lighting">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/OnOffSensor.xml b/data_model/device_types/OnOffSensor.xml
index e1bd3c3806c8a4..cdd59585119fa2 100644
--- a/data_model/device_types/OnOffSensor.xml
+++ b/data_model/device_types/OnOffSensor.xml
@@ -57,8 +57,6 @@ 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="0" summary="Revision is zero before revision numbers are defined and is
-required."/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
diff --git a/data_model/device_types/OtaProvider.xml b/data_model/device_types/OtaProvider.xml
index 28c4e3c70b88e9..375ab4e36aa987 100644
--- a/data_model/device_types/OtaProvider.xml
+++ b/data_model/device_types/OtaProvider.xml
@@ -57,16 +57,15 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
   </revisionHistory>
   <classification class="utility" scope="node"/>
   <clusters>
-    <cluster id="0x0012" name="OTA Software Update Requestor" side="client">
-      <optionalConform/>
-    </cluster>
-    <cluster id="0x0014" name="OTA Software Update Provider" side="server">
+    <cluster id="0x0029" name="OTA Software Update Provider" side="server">
       <mandatoryConform/>
     </cluster>
+    <cluster id="0x002A" name="OTA Software Update Requestor" side="client">
+      <optionalConform/>
+    </cluster>
   </clusters>
 </deviceType>
\ No newline at end of file
diff --git a/data_model/device_types/OtaRequestor.xml b/data_model/device_types/OtaRequestor.xml
index 7f5a8ca11c58c8..840e322bdccb72 100644
--- a/data_model/device_types/OtaRequestor.xml
+++ b/data_model/device_types/OtaRequestor.xml
@@ -57,15 +57,14 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
   </revisionHistory>
   <classification class="utility" scope="node"/>
   <clusters>
-    <cluster id="0x0012" name="OTA Software Update Requestor" side="server">
+    <cluster id="0x0029" name="OTA Software Update Provider" side="client">
       <mandatoryConform/>
     </cluster>
-    <cluster id="0x0014" name="OTA Software Update Provider" side="client">
+    <cluster id="0x002A" name="OTA Software Update Requestor" side="server">
       <mandatoryConform/>
     </cluster>
   </clusters>
diff --git a/data_model/device_types/PressureSensor.xml b/data_model/device_types/PressureSensor.xml
index f472daaf4e39ff..f2b7855db91c83 100644
--- a/data_model/device_types/PressureSensor.xml
+++ b/data_model/device_types/PressureSensor.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation"/>
   </revisionHistory>
diff --git a/data_model/device_types/Pump.xml b/data_model/device_types/Pump.xml
index 9ab8700abb10f5..f8c0ce92b1229d 100644
--- a/data_model/device_types/Pump.xml
+++ b/data_model/device_types/Pump.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
diff --git a/data_model/device_types/PumpController.xml b/data_model/device_types/PumpController.xml
index ca1486e4ea657e..3b27f35737197b 100644
--- a/data_model/device_types/PumpController.xml
+++ b/data_model/device_types/PumpController.xml
@@ -57,7 +57,6 @@ 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="3">
   <revisionHistory>
-    <revision revision="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
diff --git a/data_model/device_types/RoomAirConditioner.xml b/data_model/device_types/RoomAirConditioner.xml
index e8c557a21800b9..7f3acd50eb2c91 100644
--- a/data_model/device_types/RoomAirConditioner.xml
+++ b/data_model/device_types/RoomAirConditioner.xml
@@ -72,7 +72,7 @@ Davis, CA 95616, USA
     <cluster id="0x0006" name="On/Off" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="DF">
+        <feature code="" name="DeadFrontBehavior">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/RootNodeDeviceType.xml b/data_model/device_types/RootNodeDeviceType.xml
index 57b204036092c7..c2028f07d91548 100644
--- a/data_model/device_types/RootNodeDeviceType.xml
+++ b/data_model/device_types/RootNodeDeviceType.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
     <revision revision="2" summary="Added Power Source to device type; Deprecated Power Source Configuration"/>
   </revisionHistory>
@@ -155,17 +154,11 @@ Davis, CA 95616, USA
     </cluster>
     <cluster id="0x0046" name="ICD Management" side="server">
       <quality singleton="true"/>
-      <otherwiseConform>
-        <provisionalConform/>
-        <mandatoryConform>
-          <orTerm>
-            <feature name="SIT"/>
-            <feature name="LIT"/>
-          </orTerm>
-        </mandatoryConform>
-      </otherwiseConform>
+      <mandatoryConform>
+        <feature name="SIT"/>
+      </mandatoryConform>
       <features>
-        <feature code="" name="LITS">
+        <feature code="" name="LongIdleTimeSupport">
           <otherwiseConform>
             <provisionalConform/>
             <mandatoryConform>
diff --git a/data_model/device_types/Speaker.xml b/data_model/device_types/Speaker.xml
index f8bc0ab150036e..d1d9d85beb84c8 100644
--- a/data_model/device_types/Speaker.xml
+++ b/data_model/device_types/Speaker.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
diff --git a/data_model/device_types/TemperatureSensor.xml b/data_model/device_types/TemperatureSensor.xml
index 19d3fef781c717..d6ccd5c18db89f 100644
--- a/data_model/device_types/TemperatureSensor.xml
+++ b/data_model/device_types/TemperatureSensor.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <revision revision="2" summary="New data model format and notation"/>
   </revisionHistory>
diff --git a/data_model/device_types/Thermostat.xml b/data_model/device_types/Thermostat.xml
index 9f5c8e7de5b11c..16c0efe75620a0 100644
--- a/data_model/device_types/Thermostat.xml
+++ b/data_model/device_types/Thermostat.xml
@@ -57,7 +57,6 @@ 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">
   <revisionHistory>
-    <revision revision="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
diff --git a/data_model/device_types/ThreadBorderRouter.xml b/data_model/device_types/ThreadBorderRouter.xml
index 5a069e57e93243..a0aee3bfeb0433 100644
--- a/data_model/device_types/ThreadBorderRouter.xml
+++ b/data_model/device_types/ThreadBorderRouter.xml
@@ -68,7 +68,7 @@ Davis, CA 95616, USA
     <cluster id="0x0031" name="Network Commissioning" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="TH">
+        <feature code="" name="ThreadNetworkInterface">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/VideoRemoteControl.xml b/data_model/device_types/VideoRemoteControl.xml
index 33bab95b9207c1..7896a6f6ee6be5 100644
--- a/data_model/device_types/VideoRemoteControl.xml
+++ b/data_model/device_types/VideoRemoteControl.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to device type revision numbers"/>
     <revision revision="1" summary="Initial release of this document"/>
     <revision revision="2" summary="Added Content Control cluster"/>
   </revisionHistory>
diff --git a/data_model/device_types/WaterHeater.xml b/data_model/device_types/WaterHeater.xml
index 7b06da2add9de3..eeebfee95ea300 100644
--- a/data_model/device_types/WaterHeater.xml
+++ b/data_model/device_types/WaterHeater.xml
@@ -71,10 +71,10 @@ Davis, CA 95616, USA
     <cluster id="0x0098" name="Device Energy Management" side="server">
       <optionalConform/>
       <features>
-        <feature code="" name="PFR">
+        <feature code="" name="PowerForecastReporting">
           <optionalConform/>
         </feature>
-        <feature code="" name="PFA">
+        <feature code="" name="ForecastAdjustment">
           <optionalConform/>
         </feature>
       </features>
@@ -85,10 +85,10 @@ Davis, CA 95616, USA
     <cluster id="0x0201" name="Thermostat" side="server">
       <mandatoryConform/>
       <features>
-        <feature code="" name="HEAT">
+        <feature code="" name="Heating">
           <mandatoryConform/>
         </feature>
-        <feature code="" name="SCH">
+        <feature code="" name="ScheduleConfiguration">
           <mandatoryConform/>
         </feature>
       </features>
diff --git a/data_model/device_types/WindowCovering.xml b/data_model/device_types/WindowCovering.xml
index b9a33b47ac4d9b..e647e8aa005959 100644
--- a/data_model/device_types/WindowCovering.xml
+++ b/data_model/device_types/WindowCovering.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0."/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
@@ -94,25 +93,29 @@ Davis, CA 95616, USA
         </feature>
       </features>
       <commands>
-        <command id="" name="GoToLiftPercentage">
-          <field name="LiftPercentageValue">
+        <command id="" name="GoToLiftPercentage.LiftPercentageValue">
+          <field>
             <mandatoryConform>
               <condition name="Zigbee"/>
             </mandatoryConform>
           </field>
-          <field name="LiftPercent100thsValue">
+        </command>
+        <command id="" name="GoToTiltPercentage.TiltPercentageValue">
+          <field>
             <mandatoryConform>
-              <condition name="Matter"/>
+              <condition name="Zigbee"/>
             </mandatoryConform>
           </field>
         </command>
-        <command id="" name="GoToTiltPercentage">
-          <field name="TiltPercentageValue">
+        <command id="" name="GoToLiftPercentage.LiftPercent100thsValue">
+          <field>
             <mandatoryConform>
-              <condition name="Zigbee"/>
+              <condition name="Matter"/>
             </mandatoryConform>
           </field>
-          <field name="TiltPercent100thsValue">
+        </command>
+        <command id="" name="GoToTiltPercentage.TiltPercent100thsValue">
+          <field>
             <mandatoryConform>
               <condition name="Matter"/>
             </mandatoryConform>
diff --git a/data_model/device_types/WindowCoveringController.xml b/data_model/device_types/WindowCoveringController.xml
index 76f0cf1b1e2147..406953630947ea 100644
--- a/data_model/device_types/WindowCoveringController.xml
+++ b/data_model/device_types/WindowCoveringController.xml
@@ -57,7 +57,6 @@ 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="0" summary="Represents device definitions prior to Zigbee 3.0"/>
     <revision revision="1" summary="Initial Zigbee 3.0 release"/>
     <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"/>
@@ -90,7 +89,7 @@ Davis, CA 95616, USA
     <cluster id="0x0102" name="Window Covering" side="client">
       <mandatoryConform/>
       <features>
-        <feature code="" name="Absolute">
+        <feature code="" name="AbsolutePosition">
           <mandatoryConform>
             <condition name="Zigbee"/>
           </mandatoryConform>
diff --git a/data_model/spec_sha b/data_model/spec_sha
index e9d780b94f334a..cb39a57acee19b 100644
--- a/data_model/spec_sha
+++ b/data_model/spec_sha
@@ -1 +1 @@
-c1a1e1e6bcf201334eb0b5216a464b39d9827ec4
+5cf986ac3980bb2b658bae7bf13df8aeec021999