Sync csa branch with main

config/telink/chip-module/Kconfig.defaults

@@ -364,6 +364,9 @@ config OPENTHREAD_IP6_MAX_EXT_MCAST_ADDRS
     default 2 if PM
     default 8
 
+config CHIP_OPENTHREAD_NETWORK_SWITCH_PATH
+    default y
+
 endif # NET_L2_OPENTHREAD
 
 config NET_TX_STACK_SIZE

config/zephyr/Kconfig

@@ -170,6 +170,13 @@ config CHIP_FACTORY_RESET_ERASE_NVS
 	  configuration is supposed to be cleared on a factory reset, including
 	  device-specific entries.
 
+config CHIP_OPENTHREAD_NETWORK_SWITCH_PATH
+	bool "Keep Thread enabled when switching between commissioned datasets"
+	default n
+	help
+		Keep Thread enabled while switching between commissioned
+		datasets to reduce detached window during fail-safe rollback/connect.
+
 module = MATTER
 module-str = Matter
 source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"

data_model/1.6/clusters/BasicInformationCluster.xml

@@ -64,7 +64,7 @@ Davis, CA 95616, USA
     <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
     <revision revision="4" summary="Updated conformance for UniqueID to mandatory"/>
     <revision revision="5" summary="Added ConfigurationVersion attribute"/>
-    <revision revision="6"/>
+    <revision revision="6" summary="Added extended information fields to CapabilityMinimaStruct"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0028" name="Basic Information"/>

data_model/1.6/clusters/BridgedDeviceBasicInformationCluster.xml

@@ -64,7 +64,7 @@ Davis, CA 95616, USA
     <revision revision="3" summary="Added SpecificationVersion and MaxPathsPerInvoke attributes"/>
     <revision revision="4" summary="Updated conformance for UniqueID to mandatory, ProductID to optional when bridging Matter devices, add the BridgedICDSupport feature"/>
     <revision revision="5" summary="Added ConfigurationVersion attribute"/>
-    <revision revision="6"/>
+    <revision revision="6" summary="Adopt latest version of base cluster (Basic Information)"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0039" name="Bridged Device Basic Information"/>

data_model/1.6/clusters/OccupancySensing.xml

@@ -65,7 +65,7 @@ Davis, CA 95616, USA
     <revision revision="4" summary="Remove nullable from PhysicalContact delay attributes and ability to not report transitions"/>
     <revision revision="5" summary="Rework to add modalities: radar-, ambient-sensing- and vision-based sensors; add sensitivity setting (via co-located BooleanStateConfiguration cluster on same endpoint); add new attribute for tuning the sensor&apos;s reporting; add event OccupancyChanged; add N quality for HoldTime and other timing attributes; describe how to accommodate legacy clients"/>
     <revision revision="6" summary="Removed P quality"/>
-    <revision revision="7"/>
+    <revision revision="7" summary="Added OccupancyEvent feature"/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0406" name="Occupancy Sensing"/>

data_model/1.6/clusters/OperationalCredentialCluster.xml

@@ -97,12 +97,6 @@ Davis, CA 95616, USA
       <item value="6" name="InvalidAdminSubject" summary="Invalid CaseAdminSubject field for an AddNOC command.">
         <mandatoryConform/>
       </item>
-      <item value="7" name="ReservedForFutureUse" summary="Reserved for future use">
-        <mandatoryConform/>
-      </item>
-      <item value="8" name="ReservedForFutureUse" summary="Reserved for future use">
-        <mandatoryConform/>
-      </item>
       <item value="9" name="FabricConflict" summary="Trying to AddNOC instead of UpdateNOC against an existing Fabric.">
         <mandatoryConform/>
       </item>

data_model/1.6/clusters/Thermostat.xml

@@ -69,7 +69,7 @@ Davis, CA 95616, USA
     <revision revision="8" summary="Added comment regarding writing to ControlSequenceOfOperation."/>
     <revision revision="9" summary="Removed AlarmMask attribute and AlarmCodeBitmap Type."/>
     <revision revision="10" summary="Removed Zigbee related elements and P quality, deprecated ThermostatProgrammingOperationMode and removed ProgrammingOperationModeBitmap. and deprecated Setback feature and related elements."/>
-    <revision revision="11"/>
+    <revision revision="11" summary="Added events. Added support for Thermostat suggestions."/>
   </revisionHistory>
   <clusterIds>
     <clusterId id="0x0201" name="Thermostat"/>

data_model/1.6/device_types/NetworkInfraManager.xml

@@ -61,7 +61,7 @@ Davis, CA 95616, USA
   <revisionHistory>
     <revision revision="1" summary="Initial release"/>
     <revision revision="2" summary="Added Thread Network Diagnostics requirement; extended &quot;Other Requirements&quot; section"/>
-    <revision revision="3" summary=""/>
+    <revision revision="3" summary="Added Network Identity Management cluster. Added optional Thread Border Router Diagnostics cluster"/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditionRequirements>

data_model/1.6/device_types/RoomAirConditioner.xml

@@ -62,7 +62,7 @@ Davis, CA 95616, USA
     <revision revision="1" summary="Initial revision"/>
     <revision revision="2" summary="Thermostat User Interface Configuration cluster added; Updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
     <revision revision="3" summary="Added filter monitoring clusters"/>
-    <revision revision="4" summary=""/>
+    <revision revision="4" summary="Added Groupcast condition requirement."/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditionRequirements>

data_model/1.6/device_types/Thermostat.xml

@@ -64,7 +64,7 @@ Davis, CA 95616, USA
     <revision revision="3" summary="Addition of Energy Preference cluster and updated the Scenes cluster to Scenes Management with Cluster ID: 0x0062"/>
     <revision revision="4" summary="Remove Time Synchronization cluster, Scenes Management and Zigbee only clusters, remove provisional marking from Energy Preference cluster"/>
     <revision revision="5" summary="Moved disallowed element conformance to Thermostat cluster."/>
-    <revision revision="6" summary=""/>
+    <revision revision="6" summary="Added Groupcast condition requirement."/>
   </revisionHistory>
   <classification class="simple" scope="endpoint"/>
   <conditionRequirements>

data_model/1.6/scraper_version

@@ -1 +1 @@
-alchemy version: v1.6.9
+alchemy version: v1.6.11-0.20260317222315-453cc52bdb3c

data_model/1.6/spec_sha

@@ -1 +1 @@
-1cbcdd626ab769a5584be93c5844ad3a9aa2ee44
+636b190328176dc88f2cd894c7a5ba00f1935c99