@matter/model 0.17.4 → 0.17.5-alpha.0-20260702-a2cd6f764

package/src/standard/resources/basic-information.resource.ts

@@ -388,6 +388,35 @@ Resource.add({
                         "\n" +
                         "This value shall NOT be smaller than the required minimum indicated in Section 8.5.1, \"Subscribe " +
                         "Transaction\"."
+                },
+
+                {
+                    tag: "field", name: "SimultaneousInvocationsSupported", xref: "core§11.1.4.4.3",
+                    details: "This field shall indicate the actual maximum number of concurrent Invoke interactions that can be " +
+                        "processed simultaneously by the node before possibly returning a BUSY status code."
+                },
+                {
+                    tag: "field", name: "SimultaneousWritesSupported", xref: "core§11.1.4.4.4",
+                    details: "This field shall indicate the actual minimum number of concurrent Write interactions that can be " +
+                        "processed simultaneously by the node before possibly returning a BUSY status code."
+                },
+
+                {
+                    tag: "field", name: "ReadPathsSupported", xref: "core§11.1.4.4.5",
+                    details: "This field shall indicate the actual maximum number of read paths (i.e. the sum of lengths of the " +
+                        "lists of AttributePathIB and EventPathIB in the action) which a node guarantees being able to " +
+                        "process in any Read Request Action." +
+                        "\n" +
+                        "This is related to Section 2.11.2.1, \"Read Interaction Limits\"."
+                },
+
+                {
+                    tag: "field", name: "SubscribePathsSupported", xref: "core§11.1.4.4.6",
+                    details: "This field shall indicate the actual maximum number of subscription paths (i.e. the sum of lengths " +
+                        "of the lists of AttributePathIB and EventPathIB in the action) which a node guarantees being able to " +
+                        "process in any Subscribe Request Action." +
+                        "\n" +
+                        "This is related to Section 2.11.2.2, \"Subscribe Interaction Limits\"."
                 }
             ]
         }

package/src/standard/resources/boolean-state-configuration.resource.ts

@@ -44,7 +44,12 @@ Resource.add(
                             "light; it does not impact alarm reporting in AlarmsActive."
                     },
 
-                    { tag: "field", name: "SENSLVL", details: "Supports ability to set sensor sensitivity" }
+                    { tag: "field", name: "SENSLVL", details: "Supports ability to set sensor sensitivity" },
+                    {
+                        tag: "field", name: "FAULTEV", xref: "cluster§1.8.4.2",
+                        details: "This feature shall indicate that the device supports reporting sensor faults. When this feature is " +
+                            "supported, there shall be at least one cause of internal failure that will generate the SensorFault."
+                    }
                 ]
             },
 

package/src/standard/resources/boolean-state.resource.ts

@@ -14,7 +14,16 @@ Resource.add({
 
     children: [
         {
-            tag: "attribute", name: "StateValue", xref: "cluster§1.7.4.1",
+            tag: "attribute", name: "FeatureMap", xref: "cluster§1.7.4",
+            children: [{
+                tag: "field", name: "CHGEVENT", xref: "cluster§1.7.4.1",
+                details: "This feature shall indicate that the StateChange event is supported and will be generated every time " +
+                    "the state changes."
+            }]
+        },
+
+        {
+            tag: "attribute", name: "StateValue", xref: "cluster§1.7.5.1",
             details: "This represents a boolean state." +
                 "\n" +
                 "The semantics of this boolean state are defined by the device type using this cluster. For example, " +
@@ -22,10 +31,10 @@ Resource.add({
         },
 
         {
-            tag: "event", name: "StateChange", xref: "cluster§1.7.5.1",
+            tag: "event", name: "StateChange", xref: "cluster§1.7.6.1",
             details: "If this event is supported, it shall be generated when the StateValue attribute changes.",
             children: [{
-                tag: "field", name: "StateValue", xref: "cluster§1.7.5.1.1",
+                tag: "field", name: "StateValue", xref: "cluster§1.7.6.1.1",
                 details: "This field shall indicate the new value of the StateValue attribute."
             }]
         }

package/src/standard/resources/camera-av-stream-management.resource.ts

@@ -326,11 +326,18 @@ Resource.add({
             details: "This attribute indicates the currently selected AGC (Automatic Gain Control) mode for the " +
                 "microphone. A value of TRUE indicates that microphone AGC is enabled. Otherwise, it is disabled."
         },
+
         {
             tag: "attribute", name: "ImageRotation", xref: "cluster§11.2.7.35",
+
             details: "This attribute indicates the amount of clockwise rotation in degrees that the image has been " +
-                "subjected to."
+                "subjected to." +
+                "\n" +
+                "This attribute may be present if the underlying hardware allows for arbitrary angle rotation within " +
+                "the full 360 degree range. If this attribute is not present, then discrete angle rotation may be " +
+                "supported via the ImageRotationDiscreteAngles. A value of 0 means no rotation has been applied."
         },
+
         {
             tag: "attribute", name: "ImageFlipHorizontal", xref: "cluster§11.2.7.36",
             details: "This attribute indicates whether the image has been flipped horizontally or not. A value of TRUE " +
@@ -364,6 +371,15 @@ Resource.add({
             details: "This attribute indicates the brightness level of the status light."
         },
 
+        {
+            tag: "attribute", name: "ImageRotationDiscreteAngles", xref: "cluster§11.2.7.42",
+            details: "This attribute indicates the amount of clockwise rotation in specific angles of 0, 90, 180, and 270 " +
+                "degrees. This attribute is used by cameras that do not have the capability of full arbitrary " +
+                "rotation angles that can be set via the ImageRotation attribute. Note that the ImageFlipHorizontal " +
+                "and the ImageFlipVertical attributes only allow for a lateral inversion or mirror reflection of the " +
+                "image along the horizontal and/or vertical axes. A value of 0 means no rotation has been applied."
+        },
+
         {
             tag: "command", name: "AudioStreamAllocate", xref: "cluster§11.2.8.1",
             details: "This command shall allocate an audio stream on the camera and return an allocated audio stream " +

package/src/standard/resources/certification-type-enum.resource.ts

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2022-2026 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*** THIS FILE IS GENERATED, DO NOT EDIT ***/
+
+import { Resource } from "#models/Resource.js";
+
+Resource.add({
+    tag: "datatype", name: "CertificationTypeEnum", xref: "core§11.23.5.9.1",
+
+    children: [
+        { tag: "field", name: "DeviceAttestationPki", description: "used for Device Attestation PKI (PAA/PAI)" },
+        { tag: "field", name: "OperationalPki", description: "used for Operational PKI (RCAC/ICAC)" },
+        {
+            tag: "field", name: "VidSignerPki",
+            description: "used for Vendor ID Verification Signer Certificate (VVSC)"
+        }
+    ]
+});

package/src/standard/resources/closure-controller.resource.ts

@@ -11,10 +11,8 @@ import { Resource } from "#models/Resource.js";
 Resource.add({
     tag: "deviceType", name: "ClosureController", xref: "device§8.7",
     details: "A Closure Controller is capable of controlling a Closure.",
-
     children: [
         { tag: "requirement", name: "Identify", xref: "device§8.7.5" },
-        { tag: "requirement", name: "Groups", xref: "device§8.7.5" },
         { tag: "requirement", name: "ClosureControl", xref: "device§8.7.5" },
         { tag: "requirement", name: "ClosureDimension", xref: "device§8.7.5" }
     ]

package/src/standard/resources/color-control.resource.ts

@@ -414,7 +414,7 @@ Resource.add(
 
             {
                 tag: "command", name: "MoveToHue", xref: "cluster§3.2.8.4",
-                details: "This command will move the device to the requested hue value using a transition.",
+                details: "This command will move the device to the requested hue using a transition.",
 
                 children: [
                     {
@@ -435,7 +435,7 @@ Resource.add(
 
             {
                 tag: "command", name: "MoveHue", xref: "cluster§3.2.8.5",
-                details: "This command will move the device to the requested hue value using a step rate.",
+                details: "This command will change the hue of the device with a requested rate.",
 
                 children: [
                     {
@@ -452,7 +452,7 @@ Resource.add(
 
             {
                 tag: "command", name: "StepHue", xref: "cluster§3.2.8.6",
-                details: "This command will change the device to the requested hue value using a step and transition.",
+                details: "This command will change the hue of the device using a step and transition.",
 
                 children: [
                     {
@@ -481,12 +481,12 @@ Resource.add(
 
             {
                 tag: "command", name: "MoveToSaturation", xref: "cluster§3.2.8.7",
-                details: "This command will move the device to the requested saturation value using a transition."
+                details: "This command will move the device to the requested saturation using a transition."
             },
 
             {
                 tag: "command", name: "MoveSaturation", xref: "cluster§3.2.8.8",
-                details: "This command will move the device to the requested saturation value using a rate.",
+                details: "This command will change the saturation of the device with a requested rate.",
 
                 children: [
                     {
@@ -503,7 +503,7 @@ Resource.add(
 
             {
                 tag: "command", name: "StepSaturation", xref: "cluster§3.2.8.9",
-                details: "This command will change the device to the requested saturation value using a step transition.",
+                details: "This command will change the saturation of the device using a step and transition.",
 
                 children: [
                     {
@@ -532,16 +532,16 @@ Resource.add(
 
             {
                 tag: "command", name: "MoveToHueAndSaturation", xref: "cluster§3.2.8.10",
-                details: "This command will move the device to the requested hue and saturation value using a transition."
+                details: "This command will move the device to the requested hue and saturation using a transition."
             },
             {
                 tag: "command", name: "MoveToColor", xref: "cluster§3.2.8.11",
-                details: "This command will move the device to the requested color value using a transition."
+                details: "This command will move the device to the requested color using a transition."
             },
 
             {
                 tag: "command", name: "MoveColor", xref: "cluster§3.2.8.12",
-                details: "This command will move the device to the requested color using a step rate.",
+                details: "This command will change the color of the device with a requested rate.",
 
                 children: [
                     {
@@ -559,7 +559,7 @@ Resource.add(
 
             {
                 tag: "command", name: "StepColor", xref: "cluster§3.2.8.13",
-                details: "This command will move the device to the requested color using a step transition.",
+                details: "This command will change the color of the device using a step and transition.",
                 children: [{
                     tag: "field", name: "TransitionTime", xref: "cluster§3.2.8.13.2",
                     details: "The field shall indicate, in 1/10ths of a second, the time that shall be taken to perform the color " +
@@ -569,7 +569,7 @@ Resource.add(
 
             {
                 tag: "command", name: "MoveToColorTemperature", xref: "cluster§3.2.8.14",
-                details: "This command will move the device to the requested color temperate using a transition."
+                details: "This command will move the device to the requested color temperature using a transition."
             },
 
             {
@@ -612,8 +612,7 @@ Resource.add(
 
             {
                 tag: "command", name: "EnhancedStepHue", xref: "cluster§3.2.8.17",
-                details: "This command allows the light to be moved in a stepped transition from their current hue, resulting " +
-                    "in a linear transition through XY space.",
+                details: "This command allows the device to be moved in a stepped transition from their current hue.",
 
                 children: [
                     {

package/src/standard/resources/energy-preference.resource.ts

@@ -10,11 +10,7 @@ import { Resource } from "#models/Resource.js";
 
 Resource.add({
     tag: "cluster", name: "EnergyPreference", pics: "EPREF", xref: "cluster§9.7",
-    details: "This cluster provides an interface to specify preferences for how devices should consume energy." +
-        "\n" +
-        "> [!NOTE]" +
-        "\n" +
-        "> NOTE: Support for Energy Preference cluster is provisional.",
+    details: "This cluster provides an interface to specify preferences for how devices should consume energy.",
 
     children: [
         {

package/src/standard/resources/general-commissioning.resource.ts

@@ -180,9 +180,9 @@ Resource.add(
                     "Layer (NTL), because it can harvest energy from NFC to operate. However, such a Commissionee must be " +
                     "powered on to switch to the operational channel." +
                     "\n" +
-                    "This attribute is used by the Commissioner as described in step 18 of Section 5.5, \"Commissioning " +
-                    "Flows\". This attribute is linked to the Commissionee behavior after reception of the ConnectNetwork " +
-                    "Command."
+                    "This attribute is used by the Commissioner as described in initial phase step 17 of Section 5.5, " +
+                    "\"Commissioning Flows\". This attribute is linked to the Commissionee behavior after reception of the " +
+                    "ConnectNetwork Command."
             },
 
             {
@@ -400,7 +400,7 @@ Resource.add(
                         tag: "field", name: "TcUserResponse", xref: "core§11.10.7.8.2",
                         details: "This field shall contain the user responses to the Enhanced Setup Flow Terms & Conditions as a map " +
                             "where each bit set in the bitmap corresponds to an accepted term in the file located at Section " +
-                            "11.23.6.22, \"EnhancedSetupFlowTCUrl\"."
+                            "11.23.6.23, \"EnhancedSetupFlowTCUrl\"."
                     }
                 ]
             },

package/src/standard/resources/general-diagnostics.resource.ts

@@ -117,6 +117,10 @@ Resource.add({
         },
 
         { tag: "attribute", name: "DoNotUse", xref: "core§11.12.6" },
+        {
+            tag: "attribute", name: "DeviceLoadStatus", xref: "core§11.12.6.10",
+            details: "Indicates the status of various resources used."
+        },
 
         {
             tag: "event", name: "HardwareFaultChange", xref: "core§11.12.8.1",
@@ -525,6 +529,50 @@ Resource.add({
                     details: "This field shall indicate the type of the interface using the InterfaceTypeEnum."
                 }
             ]
+        },
+
+        {
+            tag: "datatype", name: "DeviceLoadStruct", xref: "core§11.12.5.7",
+
+            details: "This structure describes some important resource utilization metrics for the Node, as provided in " +
+                "the DeviceLoadStatus attribute." +
+                "\n" +
+                "> [!NOTE]" +
+                "\n" +
+                "> NOTE: For all the fields, the value shall remain at the maximum representable (clamp to max) if " +
+                "the maximum value is reached.",
+
+            children: [
+                {
+                    tag: "field", name: "CurrentSubscriptions", xref: "core§11.12.5.7.1",
+                    details: "This field shall indicate the number of currently-active Interaction Model subscriptions across all " +
+                        "fabrics on the node."
+                },
+                {
+                    tag: "field", name: "CurrentSubscriptionsForFabric", xref: "core§11.12.5.7.2",
+                    details: "This field shall indicate the number of currently-active Interaction Model subscriptions for the " +
+                        "accessing fabric only. If no accessing fabric is available, this field shall be set to zero."
+                },
+                {
+                    tag: "field", name: "TotalSubscriptionsEstablished", xref: "core§11.12.5.7.3",
+                    details: "This field shall indicate the total number of Interaction Model subscriptions successfully " +
+                        "established across all fabrics on the node since start-up."
+                },
+
+                {
+                    tag: "field", name: "TotalInteractionModelMessagesSent", xref: "core§11.12.5.7.4",
+                    details: "This field shall indicate the number of outgoing Interaction Model protocol messages sent since " +
+                        "start-up. These are messages that have the Protocol ID set to PROTOCOL_ID_INTERACTION_MODEL, " +
+                        "excluding any retries of such messages."
+                },
+
+                {
+                    tag: "field", name: "TotalInteractionModelMessagesReceived", xref: "core§11.12.5.7.5",
+                    details: "This field shall indicate the number of incoming Interaction Model protocol messages received since " +
+                        "start-up. These are messages that have the Protocol ID set to PROTOCOL_ID_INTERACTION_MODEL, " +
+                        "excluding any retries of such messages."
+                }
+            ]
         }
     ]
 });

package/src/standard/resources/group-key-management.resource.ts

@@ -11,11 +11,11 @@ import { Resource } from "#models/Resource.js";
 Resource.add({
     tag: "cluster", name: "GroupKeyManagement", pics: "GRPKEY", xref: "core§11.2",
 
-    details: "The Group Key Management cluster manages group keys for the node. The cluster is scoped to the node " +
-        "and is a singleton for the node. This cluster maintains a list of groups supported by the node. Each " +
-        "group list entry supports a single group, with a single group ID and single group key. Duplicate " +
-        "groups are not allowed in the list. Additions or removal of a group entry are performed via " +
-        "modifications of the list. Such modifications require Administer privilege." +
+    details: "The Group Key Management cluster manages shared symmetric keys for the node. The cluster is scoped " +
+        "to the node and is a singleton for the node. This cluster maintains a list of groups supported by " +
+        "the node. Each group list entry supports a single group, with a single group ID and single group " +
+        "key. Duplicate groups are not allowed in the list. Additions or removal of a group entry are " +
+        "performed via modifications of the list. Such modifications require Administer privilege." +
         "\n" +
         "Each group entry includes a membership list of zero of more endpoints that are members of the group " +
         "on the node. Modification of this membership list is done via the Groups cluster, which is scoped to " +
@@ -25,21 +25,67 @@ Resource.add({
     children: [
         {
             tag: "attribute", name: "FeatureMap", xref: "core§11.2.4",
+
             children: [
-                { tag: "field", name: "CS", details: "The ability to support CacheAndSync security policy and MCSP." }
+                {
+                    tag: "field", name: "CS", xref: "core§11.2.4.1",
+                    details: "The CacheAndSync security policy has been provisional since Matter v1.0."
+                },
+
+                {
+                    tag: "field", name: "GCAST", xref: "core§11.2.4.2",
+
+                    details: "When set, group management and group key mapping is done using the Section 11.27, \"Groupcast " +
+                        "Cluster\"." +
+                        "\n" +
+                        "If the Groupcast cluster is present on the Root Node endpoint, then this feature bit shall be set." +
+                        "\n" +
+                        "When this feature map bit is set, this cluster SHOULD be used solely for key management as the " +
+                        "Groupcast cluster offers more direct and long-term supported methods of managing group key mapping."
+                }
             ]
         },
 
         {
             tag: "attribute", name: "GroupKeyMap", xref: "core§11.2.6.1",
-            details: "This attribute is a list of GroupKeyMapStruct entries. Each entry associates a logical Group Id with " +
+
+            details: "If the GCAST feature bit is set in the FeatureMap attribute, the following rules apply to the " +
+                "accessing Fabric:" +
+                "\n" +
+                "  - When Groupcast is adopted (the GroupcastAdoption entry has GroupcastAdopted set to true):" +
+                "\n" +
+                "  - This attribute shall be empty." +
+                "\n" +
+                "  - Any attempt to write to this attribute shall fail with an INVALID_IN_STATE status code." +
+                "\n" +
+                "  - Otherwise (Groupcast is not adopted or the entry is missing):" +
+                "\n" +
+                "  - This attribute shall contain the Group Key Set mappings derived from the Groupcast cluster's " +
+                "Membership attribute (one mapping per group per fabric)." +
+                "\n" +
+                "  - GroupKeyMapStruct entry updates shall cause the associated Groupcast cluster's Membership " +
+                "attribute (by GroupID) to be updated with the provided GroupKeySetID. If an entry is missing for " +
+                "a given GroupID in the GroupKeyMap, which exists in the Groupcast cluster's Membership attribute " +
+                "for a given fabric, then the Groupcast cluster's membership attribute shall use placeholder " +
+                "value 65535 for the KeySetID. While this KeySetID is technically valid, administrators SHOULD " +
+                "avoid allocating it for actual usage to avoid value aliasing for this field." +
+                "\n" +
+                "This attribute is a list of GroupKeyMapStruct entries. Each entry associates a logical Group Id with " +
                 "a particular group key set."
         },
 
         {
             tag: "attribute", name: "GroupTable", xref: "core§11.2.6.2",
 
-            details: "This attribute is a list of GroupInfoMapStruct entries. Each entry provides read-only information " +
+            details: "If the GCAST feature is set in the FeatureMap:" +
+                "\n" +
+                "  - If the GroupcastAdoption attribute has an entry for the accessing Fabric and that entry has the " +
+                "GroupcastAdopted field set to true, then this field shall be empty." +
+                "\n" +
+                "  - Else this attribute shall contain the Group mappings computed in equivalence to the Groupcast " +
+                "cluster's Membership attribute (one mapping per group per fabric)." +
+                "\n" +
+                "This attribute is a list of GroupInfoMapStruct entries. Each entry provides read-only information " +
                 "about how a given logical Group ID maps to a particular set of endpoints, and a name for the group. " +
                 "The content of this attribute reflects data managed via the Groups cluster (see " +
                 "[[AppClusters]](#ref_AppClusters)), and is in general terms referred to as the 'node-wide Group " +
@@ -52,11 +98,16 @@ Resource.add({
 
         {
             tag: "attribute", name: "MaxGroupsPerFabric", xref: "core§11.2.6.3",
-            details: "Indicates the maximum number of groups that this node supports per fabric. The value of this " +
-                "attribute shall be set to be no less than the required minimum supported groups as specified in " +
-                "Section 2.11.1.2, \"Group Limits\". The length of the GroupKeyMap and GroupTable list attributes shall " +
-                "NOT exceed the value of the MaxGroupsPerFabric attribute multiplied by the number of supported " +
-                "fabrics."
+
+            details: "If the Groupcast support is enabled (GCAST feature is set), this shall be set to 0 indicating group " +
+                "management is done using the Groupcast cluster and not the legacy Groups cluster." +
+                "\n" +
+                "Indicates the maximum number of legacy groups that this node supports per fabric. For legacy usage, " +
+                "the value of this attribute shall be set to be no less than the required minimum supported groups as " +
+                "specified in Section 2.11.1.2, \"Group Limits\"." +
+                "\n" +
+                "The length of the GroupKeyMap and GroupTable list attributes shall NOT exceed the value of the " +
+                "MaxGroupsPerFabric attribute multiplied by the number of supported fabrics."
         },
 
         {
@@ -66,6 +117,20 @@ Resource.add({
                 "Section 2.11.1.2, \"Group Limits\"."
         },
 
+        {
+            tag: "attribute", name: "GroupcastAdoption", xref: "core§11.2.6.5",
+
+            details: "Indicates whether the accessing fabric claims to have migrated to Groupcast." +
+                "\n" +
+                "When a Fabric's entry has the GroupcastAdopted field set to true, the behavior of the GroupKeyMap " +
+                "and GroupTable attributes will change (see description of respective attributes)." +
+                "\n" +
+                "There shall NOT be more than 1 entry per fabric in this attribute." +
+                "\n" +
+                "If a Fabric has not yet written an entry for themselves, the server shall act as if that Fabric had " +
+                "written an entry with GroupcastAdopted set to false, even if not present in the list."
+        },
+
         {
             tag: "command", name: "KeySetWrite", xref: "core§11.2.7.1",
             details: "This command is used by Administrators to set the state of a given Group Key Set, including " +
@@ -177,9 +242,10 @@ Resource.add({
 
                 {
                     tag: "field", name: "EpochKey0", xref: "core§11.2.5.4.3",
-                    details: "This field, if not null, shall be the root credential used in the derivation of an operational group " +
-                        "key for epoch slot 0 of the given group key set. If EpochKey0 is not null, EpochStartTime0 shall NOT " +
-                        "be null."
+                    details: "This field, if not null, shall be the InputKey used in the derivation of an OperationalGroupKey for " +
+                        "epoch slot 0 of the given group key set. The derived OperationalGroupKey shall be persistently " +
+                        "stored for the lifetime of the derived key; however, the InputKey itself shall NOT be stored. If " +
+                        "EpochKey0 is not null, EpochStartTime0 shall NOT be null."
                 },
 
                 {
@@ -190,9 +256,10 @@ Resource.add({
 
                 {
                     tag: "field", name: "EpochKey1", xref: "core§11.2.5.4.5",
-                    details: "This field, if not null, shall be the root credential used in the derivation of an operational group " +
-                        "key for epoch slot 1 of the given group key set. If EpochKey1 is not null, EpochStartTime1 shall NOT " +
-                        "be null."
+                    details: "This field, if not null, shall be the InputKey used in the derivation of an OperationalGroupKey for " +
+                        "epoch slot 1 of the given group key set. The derived OperationalGroupKey shall be persistently " +
+                        "stored for the lifetime of the derived key; however, the InputKey itself shall NOT be stored. If " +
+                        "EpochKey1 is not null, EpochStartTime1 shall NOT be null."
                 },
 
                 {
@@ -203,33 +270,23 @@ Resource.add({
 
                 {
                     tag: "field", name: "EpochKey2", xref: "core§11.2.5.4.7",
-                    details: "This field, if not null, shall be the root credential used in the derivation of an operational group " +
-                        "key for epoch slot 2 of the given group key set. If EpochKey2 is not null, EpochStartTime2 shall NOT " +
-                        "be null."
-                },
 
-                {
-                    tag: "field", name: "EpochStartTime2", xref: "core§11.2.5.4.8",
-                    details: "This field, if not null, shall define when EpochKey2 becomes valid as specified by Section 4.17.3, " +
-                        "\"Epoch Keys\". Units are absolute UTC time in microseconds encoded using the epoch-us representation."
+                    details: "If the GCAST feature bit is set in the FeatureMap, this field shall be null, unless the " +
+                        "GroupKeySetId is 0 (the Identity Protection Key)." +
+                        "\n" +
+                        "This field, if not null, shall be the InputKey used in the derivation of an OperationalGroupKey for " +
+                        "epoch slot 2 of the given group key set. The derived OperationalGroupKey shall be persistently " +
+                        "stored for the lifetime of the derived key; however, the InputKey itself shall NOT be stored. If " +
+                        "EpochKey2 is not null, EpochStartTime2 shall NOT be null."
                 },
 
                 {
-                    tag: "field", name: "GroupKeyMulticastPolicy", xref: "core§11.2.5.4.9",
-
-                    details: "This field specifies how the IPv6 Multicast Address shall be formed for groups using this " +
-                        "operational group key set." +
-                        "\n" +
-                        "The PerGroupID method maximizes filtering of multicast messages, so that receiving nodes receive " +
-                        "only multicast messages for groups to which they are subscribed." +
-                        "\n" +
-                        "The AllNodes method minimizes the number of multicast addresses to which a receiver node needs to " +
-                        "subscribe." +
-                        "\n" +
-                        "> [!NOTE]" +
+                    tag: "field", name: "EpochStartTime2", xref: "core§11.2.5.4.8",
+                    details: "If the GCAST feature bit is set in the FeatureMap, this field shall be null, unless the " +
+                        "GroupKeySetId is 0 (the Identity Protection Key)." +
                         "\n" +
-                        "> NOTE: Support for GroupKeyMulticastPolicy is provisional. Correct default behavior is that implied " +
-                        "by value PerGroupID."
+                        "This field, if not null, shall define when EpochKey2 becomes valid as specified by Section 4.17.3, " +
+                        "\"Epoch Keys\". Units are absolute UTC time in microseconds encoded using the epoch-us representation."
                 }
             ]
         },
@@ -253,6 +310,14 @@ Resource.add({
                         "given GroupId on any Endpoint via the Groups cluster."
                 }
             ]
+        },
+
+        {
+            tag: "datatype", name: "GroupcastAdoptionStruct", xref: "core§11.2.5.6",
+            children: [{
+                tag: "field", name: "GroupcastAdopted", xref: "core§11.2.5.6.1",
+                details: "This field shall indicate whether Groupcast was adopted by the associated Fabric's administrators."
+            }]
         }
     ]
 });