diff --git a/data_model/clusters/AccountLogin.xml b/data_model/clusters/AccountLogin.xml
index 4add6f4189d279..3cd5c02590ea0a 100644
--- a/data_model/clusters/AccountLogin.xml
+++ b/data_model/clusters/AccountLogin.xml
@@ -73,9 +73,8 @@ Davis, CA 95616, USA
       <access invokePrivilege="operate" fabricScoped="true"/>
       <mandatoryConform/>
       <field id="0" name="SetupPIN" type="string">
-        <quality nullable="true"/>
         <mandatoryConform/>
-        <constraint type="minLength" value="11"/>
+        <constraint type="desc"/>
       </field>
     </command>
     <command id="0x02" name="Login" response="Y">
diff --git a/data_model/clusters/AlarmBase.xml b/data_model/clusters/AlarmBase.xml
index b169d4fe9be24a..834089869b21da 100644
--- a/data_model/clusters/AlarmBase.xml
+++ b/data_model/clusters/AlarmBase.xml
@@ -115,13 +115,13 @@ Davis, CA 95616, USA
       <field id="1" name="Active" type="AlarmMap" default="0">
         <mandatoryConform/>
       </field>
-      <field id="1" name="Inactive" type="AlarmMap" default="0">
+      <field id="2" name="Inactive" type="AlarmMap" default="0">
         <mandatoryConform/>
       </field>
-      <field id="2" name="State" type="AlarmMap" default="0">
+      <field id="3" name="State" type="AlarmMap" default="0">
         <mandatoryConform/>
       </field>
-      <field id="3" name="Mask" type="AlarmMap" default="0">
+      <field id="4" name="Mask" type="AlarmMap" default="0">
         <mandatoryConform/>
       </field>
     </event>
diff --git a/data_model/clusters/BallastConfiguration.xml b/data_model/clusters/BallastConfiguration.xml
index a6d553ddcc6ead..416b8cd7014beb 100644
--- a/data_model/clusters/BallastConfiguration.xml
+++ b/data_model/clusters/BallastConfiguration.xml
@@ -124,12 +124,12 @@ Davis, CA 95616, USA
       <access read="true" readPrivilege="view"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0030" name="LampType" type="string" default="empty string">
+    <attribute id="0x0030" name="LampType" type="string" default="&quot;">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
       <optionalConform/>
       <constraint type="maxLength" value="16"/>
     </attribute>
-    <attribute id="0x0031" name="LampManufacturer" type="string" default="empty string">
+    <attribute id="0x0031" name="LampManufacturer" type="string" default="&quot;">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
       <optionalConform/>
       <constraint type="maxLength" value="16"/>
diff --git a/data_model/clusters/Channel.xml b/data_model/clusters/Channel.xml
index 3227cf9a5a446e..b75540d94a6baf 100644
--- a/data_model/clusters/Channel.xml
+++ b/data_model/clusters/Channel.xml
@@ -129,8 +129,9 @@ Davis, CA 95616, USA
         <feature name="CL"/>
       </mandatoryConform>
     </attribute>
-    <attribute id="0x0001" name="Lineup" type="LineupInfoStruct">
+    <attribute id="0x0001" name="Lineup" type="LineupInfoStruct" default="null">
       <access read="true" readPrivilege="view"/>
+      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform>
         <feature name="LI"/>
       </mandatoryConform>
diff --git a/data_model/clusters/DiagnosticsThread.xml b/data_model/clusters/DiagnosticsThread.xml
index 2f8e97b150ffc2..ddcf246e9c99c3 100644
--- a/data_model/clusters/DiagnosticsThread.xml
+++ b/data_model/clusters/DiagnosticsThread.xml
@@ -653,7 +653,7 @@ Davis, CA 95616, USA
       <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x003e" name="ActiveNetworkFaults" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NetworkFaultEnum Type]">
+    <attribute id="0x003e" name="ActiveNetworkFaultsList" type="&lt;&lt;ref_DataTypeList&gt;&gt;[NetworkFaultEnum Type]">
       <access read="true" readPrivilege="view"/>
       <mandatoryConform/>
       <constraint type="max" value="4"/>
diff --git a/data_model/clusters/KeypadInput.xml b/data_model/clusters/KeypadInput.xml
index 81f16ec0830aef..7179ae676b65fe 100644
--- a/data_model/clusters/KeypadInput.xml
+++ b/data_model/clusters/KeypadInput.xml
@@ -72,6 +72,266 @@ Davis, CA 95616, USA
     </feature>
   </features>
   <dataTypes>
+    <enum name="CecKeyCodeEnum">
+      <item value="0" name="Select">
+        <mandatoryConform/>
+      </item>
+      <item value="1" name="Up">
+        <mandatoryConform/>
+      </item>
+      <item value="2" name="Down">
+        <mandatoryConform/>
+      </item>
+      <item value="3" name="Left">
+        <mandatoryConform/>
+      </item>
+      <item value="4" name="Right">
+        <mandatoryConform/>
+      </item>
+      <item value="5" name="RightUp">
+        <mandatoryConform/>
+      </item>
+      <item value="6" name="RightDown">
+        <mandatoryConform/>
+      </item>
+      <item value="7" name="LeftUp">
+        <mandatoryConform/>
+      </item>
+      <item value="8" name="LeftDown">
+        <mandatoryConform/>
+      </item>
+      <item value="9" name="RootMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="10" name="SetupMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="11" name="ContentsMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="12" name="FavoriteMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="13" name="Exit">
+        <mandatoryConform/>
+      </item>
+      <item value="16" name="MediaTopMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="17" name="MediaContextSensitiveMenu">
+        <mandatoryConform/>
+      </item>
+      <item value="29" name="NumberEntryMode">
+        <mandatoryConform/>
+      </item>
+      <item value="30" name="Number11">
+        <mandatoryConform/>
+      </item>
+      <item value="31" name="Number12">
+        <mandatoryConform/>
+      </item>
+      <item value="32" name="Number0OrNumber10">
+        <mandatoryConform/>
+      </item>
+      <item value="33" name="Numbers1">
+        <mandatoryConform/>
+      </item>
+      <item value="34" name="Numbers2">
+        <mandatoryConform/>
+      </item>
+      <item value="35" name="Numbers3">
+        <mandatoryConform/>
+      </item>
+      <item value="36" name="Numbers4">
+        <mandatoryConform/>
+      </item>
+      <item value="37" name="Numbers5">
+        <mandatoryConform/>
+      </item>
+      <item value="38" name="Numbers6">
+        <mandatoryConform/>
+      </item>
+      <item value="39" name="Numbers7">
+        <mandatoryConform/>
+      </item>
+      <item value="40" name="Numbers8">
+        <mandatoryConform/>
+      </item>
+      <item value="41" name="Numbers9">
+        <mandatoryConform/>
+      </item>
+      <item value="42" name="Dot">
+        <mandatoryConform/>
+      </item>
+      <item value="43" name="Enter">
+        <mandatoryConform/>
+      </item>
+      <item value="44" name="Clear">
+        <mandatoryConform/>
+      </item>
+      <item value="47" name="NextFavorite">
+        <mandatoryConform/>
+      </item>
+      <item value="48" name="ChannelUp">
+        <mandatoryConform/>
+      </item>
+      <item value="49" name="ChannelDown">
+        <mandatoryConform/>
+      </item>
+      <item value="50" name="PreviousChannel">
+        <mandatoryConform/>
+      </item>
+      <item value="51" name="SoundSelect">
+        <mandatoryConform/>
+      </item>
+      <item value="52" name="InputSelect">
+        <mandatoryConform/>
+      </item>
+      <item value="53" name="DisplayInformation">
+        <mandatoryConform/>
+      </item>
+      <item value="54" name="Help">
+        <mandatoryConform/>
+      </item>
+      <item value="55" name="PageUp">
+        <mandatoryConform/>
+      </item>
+      <item value="56" name="PageDown">
+        <mandatoryConform/>
+      </item>
+      <item value="64" name="Power">
+        <mandatoryConform/>
+      </item>
+      <item value="65" name="VolumeUp">
+        <mandatoryConform/>
+      </item>
+      <item value="66" name="VolumeDown">
+        <mandatoryConform/>
+      </item>
+      <item value="67" name="Mute">
+        <mandatoryConform/>
+      </item>
+      <item value="68" name="Play">
+        <mandatoryConform/>
+      </item>
+      <item value="69" name="Stop">
+        <mandatoryConform/>
+      </item>
+      <item value="70" name="Pause">
+        <mandatoryConform/>
+      </item>
+      <item value="71" name="Record">
+        <mandatoryConform/>
+      </item>
+      <item value="72" name="Rewind">
+        <mandatoryConform/>
+      </item>
+      <item value="73" name="FastForward">
+        <mandatoryConform/>
+      </item>
+      <item value="74" name="Eject">
+        <mandatoryConform/>
+      </item>
+      <item value="75" name="Forward">
+        <mandatoryConform/>
+      </item>
+      <item value="76" name="Backward">
+        <mandatoryConform/>
+      </item>
+      <item value="77" name="StopRecord">
+        <mandatoryConform/>
+      </item>
+      <item value="78" name="PauseRecord">
+        <mandatoryConform/>
+      </item>
+      <item value="79" name="Reserved">
+        <mandatoryConform/>
+      </item>
+      <item value="80" name="Angle">
+        <mandatoryConform/>
+      </item>
+      <item value="81" name="SubPicture">
+        <mandatoryConform/>
+      </item>
+      <item value="82" name="VideoOnDemand">
+        <mandatoryConform/>
+      </item>
+      <item value="83" name="ElectronicProgramGuide">
+        <mandatoryConform/>
+      </item>
+      <item value="84" name="TimerProgramming">
+        <mandatoryConform/>
+      </item>
+      <item value="85" name="InitialConfiguration">
+        <mandatoryConform/>
+      </item>
+      <item value="86" name="SelectBroadcastType">
+        <mandatoryConform/>
+      </item>
+      <item value="87" name="SelectSoundPresentation">
+        <mandatoryConform/>
+      </item>
+      <item value="96" name="PlayFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="97" name="PausePlayFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="98" name="RecordFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="99" name="PauseRecordFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="100" name="StopFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="101" name="MuteFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="102" name="RestoreVolumeFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="103" name="TuneFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="104" name="SelectMediaFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="105" name="SelectAvInputFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="106" name="SelectAudioInputFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="107" name="PowerToggleFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="108" name="PowerOffFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="109" name="PowerOnFunction">
+        <mandatoryConform/>
+      </item>
+      <item value="113" name="F1Blue">
+        <mandatoryConform/>
+      </item>
+      <item value="114" name="F2Red">
+        <mandatoryConform/>
+      </item>
+      <item value="115" name="F3Green">
+        <mandatoryConform/>
+      </item>
+      <item value="116" name="F4Yellow">
+        <mandatoryConform/>
+      </item>
+      <item value="117" name="F5">
+        <mandatoryConform/>
+      </item>
+      <item value="118" name="Data">
+        <mandatoryConform/>
+      </item>
+    </enum>
     <enum name="StatusEnum">
       <item value="0" name="Success" summary="Succeeded">
         <mandatoryConform/>
@@ -88,7 +348,7 @@ Davis, CA 95616, USA
     <command id="0x00" name="SendKey" response="SendKeyResponse">
       <access invokePrivilege="operate"/>
       <mandatoryConform/>
-      <field id="0" name="KeyCode" type="uint8">
+      <field id="0" name="KeyCode" type="CecKeyCodeEnum">
         <mandatoryConform/>
       </field>
     </command>
diff --git a/data_model/clusters/LocalizationTimeFormat.xml b/data_model/clusters/LocalizationTimeFormat.xml
index 9c0ffa062fec58..1a7b6976a69ec6 100644
--- a/data_model/clusters/LocalizationTimeFormat.xml
+++ b/data_model/clusters/LocalizationTimeFormat.xml
@@ -103,6 +103,9 @@ Davis, CA 95616, USA
       <item value="11" name="Taiwanese" summary="Dates conveyed using the Taiwanese calendar">
         <optionalConform choice="a" more="true"/>
       </item>
+      <item value="255" name="UseActiveLocale" summary="calendar implied from active locale">
+        <optionalConform choice="a" more="true"/>
+      </item>
     </enum>
     <enum name="HourFormatEnum">
       <item value="0" name="12hr" summary="Time conveyed with a 12-hour clock">
@@ -111,17 +114,20 @@ Davis, CA 95616, USA
       <item value="1" name="24hr" summary="Time conveyed with a 24-hour clock">
         <mandatoryConform/>
       </item>
+      <item value="255" name="UseActiveLocale" summary="Use active locale clock">
+        <mandatoryConform/>
+      </item>
     </enum>
   </dataTypes>
   <attributes>
-    <attribute id="0x0000" name="HourFormat" type="HourFormatEnum" default="null">
+    <attribute id="0x0000" name="HourFormat" type="HourFormatEnum">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0001" name="ActiveCalendarType" type="CalendarTypeEnum" default="null">
+    <attribute id="0x0001" name="ActiveCalendarType" type="CalendarTypeEnum">
       <access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="nonVolatile" reportable="false"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
       <mandatoryConform>
         <feature name="CALFMT"/>
       </mandatoryConform>
diff --git a/data_model/clusters/TargetNavigator.xml b/data_model/clusters/TargetNavigator.xml
index 3a49e7b5c6c838..ffb6955d27bf3c 100644
--- a/data_model/clusters/TargetNavigator.xml
+++ b/data_model/clusters/TargetNavigator.xml
@@ -75,6 +75,7 @@ Davis, CA 95616, USA
     <struct name="TargetInfoStruct">
       <field id="0" name="Identifier" type="uint8">
         <mandatoryConform/>
+        <constraint type="max" value="254"/>
       </field>
       <field id="1" name="Name" type="string">
         <mandatoryConform/>
@@ -86,9 +87,8 @@ Davis, CA 95616, USA
       <access read="true" readPrivilege="view"/>
       <mandatoryConform/>
     </attribute>
-    <attribute id="0x0001" name="CurrentTarget" type="uint8" default="null">
+    <attribute id="0x0001" name="CurrentTarget" type="uint8" default="0xFF">
       <access read="true" readPrivilege="view"/>
-      <quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
       <optionalConform/>
       <constraint type="desc"/>
     </attribute>
diff --git a/data_model/clusters/WakeOnLAN.xml b/data_model/clusters/WakeOnLAN.xml
index eede336182e6dc..799c92a03fd9b8 100644
--- a/data_model/clusters/WakeOnLAN.xml
+++ b/data_model/clusters/WakeOnLAN.xml
@@ -61,11 +61,11 @@ Davis, CA 95616, USA
   </revisionHistory>
   <classification hierarchy="base" role="application" picsCode="WAKEONLAN" scope="Endpoint"/>
   <attributes>
-    <attribute id="0x0000" name="MACAddress" type="hwadr">
+    <attribute id="0x0000" name="MACAddress" type="string">
       <access read="true" readPrivilege="view"/>
       <quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
       <optionalConform/>
-      <constraint type="desc"/>
+      <constraint type="maxLength" value="12"/>
     </attribute>
     <attribute id="0x0001" name="LinkLocalAddress" type="ipv6adr">
       <access read="true" readPrivilege="view"/>
diff --git a/data_model/spec_sha b/data_model/spec_sha
index d114fd3ddcace3..03c3b85baa2427 100644
--- a/data_model/spec_sha
+++ b/data_model/spec_sha
@@ -1 +1 @@
-17cfdc4a04397eec62f1bce7984cace268b28ab3
+49003c1b2337aa51dad227977981b763667d1f75