diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
index 186f8f2306e915..010a3ed0174451 100644
--- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
+++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.zap
@@ -17,12 +17,6 @@
     }
   ],
   "package": [
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
-    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -30,6 +24,12 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
index 35f68296ead056..4aafe1296da9d5 100644
--- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
+++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter
@@ -431,6 +431,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 626e322571801f..7854ed633e75db 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -1369,6 +1369,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
@@ -7395,11 +7399,15 @@ endpoint 0 {
     callback attribute regulatoryConfig;
     callback attribute locationCapability;
     callback attribute supportsConcurrentConnection;
+    ram      attribute TCAcceptedVersion;
+    ram      attribute TCMinRequiredVersion default = 1;
+    ram      attribute TCAcknowledgements default = 0x0000;
+    ram      attribute TCAcknowledgementsRequired default = true;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
-    ram      attribute featureMap default = 0;
+    ram      attribute featureMap default = 1;
     ram      attribute clusterRevision default = 1;
 
     handle command ArmFailSafe;
@@ -7408,6 +7416,8 @@ endpoint 0 {
     handle command SetRegulatoryConfigResponse;
     handle command CommissioningComplete;
     handle command CommissioningCompleteResponse;
+    handle command SetTCAcknowledgements;
+    handle command SetTCAcknowledgementsResponse;
   }
 
   server cluster NetworkCommissioning {
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
index e9d737e8720683..c7bba09973413f 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index dd8c03de1840bb..9246d12b585107 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -834,6 +834,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
index b2bdb7fffbbfcd..d5c1e26917e673 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
@@ -645,6 +645,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
index ab147f69665689..163234429a7778 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap
@@ -17,12 +17,6 @@
     }
   ],
   "package": [
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
-    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -30,6 +24,12 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index f2489d956c62d2..e7aa7e49af684d 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -705,6 +705,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
index bd3e05c8bdbe9f..9c6dc31172da82 100644
--- a/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
+++ b/examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter
@@ -690,6 +690,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index 48bcca698d39f2..1cff071f95ab06 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -590,6 +590,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index 146a2e05d8ecb2..f394b1a1d835d4 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index 4f21fc980792c2..ccd7b8bfcf13a2 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -787,6 +787,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
index 9b4cc6719e02b2..6a2356caf8f495 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter
@@ -364,6 +364,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
index 37a134c47c31bb..669a57fc764fcd 100644
--- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
+++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index 3687427a75570e..667c51e95e6df8 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -751,6 +751,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index ab4fb6ea844026..10ac8bbd1563cb 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 65525612ac6706..d2da958b91b7bd 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -787,6 +787,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index bf6d3fda5de7a3..9916bff2fa69df 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -590,6 +590,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index b282ce4de4860a..46991c8fc72c7b 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -17,12 +17,6 @@
     }
   ],
   "package": [
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
-    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -30,6 +24,12 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index 5e95fb363d8777..4370c8f72797b9 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -590,6 +590,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index 0110470e2ff39c..5d90efc4c8ffc9 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index 9493c329a2a13c..967e948b6b56ba 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -734,6 +734,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index 83a83074085a35..42f7022b164fbe 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index dbdf6f31d51ce8..e226e50c131c50 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -590,6 +590,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index d5de675bbed6f7..e9b9cee6c9e49c 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
@@ -17,12 +17,6 @@
     }
   ],
   "package": [
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
-    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -30,6 +24,12 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
index 5b043845156178..79c42c4dc8a66c 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
@@ -436,6 +436,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
index 17409ef1ccf4b6..9615943cff65bc 100644
--- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
+++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter
@@ -364,6 +364,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
index f49e1c0cc346e4..72fdaa7efee5c4 100644
--- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
+++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter
@@ -354,6 +354,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
index 6d4f5696ae3632..4b5b37c4aa65d4 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
@@ -426,6 +426,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
index 671e8280b68c20..6ee4b99723f582 100644
--- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
+++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter
@@ -613,6 +613,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index 3a360025f4e01c..04f843046abb9f 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -710,6 +710,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index c27d27d4d43b68..0fffc0bff03830 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -590,6 +590,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index 11180935a3d145..d2837ac0660ccd 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
@@ -17,12 +17,6 @@
     }
   ],
   "package": [
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
-    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -30,6 +24,12 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index e1c7a02c1b0320..6e67ef19e48f3a 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -590,6 +590,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index 58cc4b985c4763..b5505fb2b103bc 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -590,6 +590,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
index 13c70090a00c8b..1f4d32ed722641 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
@@ -569,6 +569,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
index 0b467bdfc493a6..552f85a4e1a2e9 100644
--- a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter
@@ -431,6 +431,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap
index 06510a207979c9..2a8c12b4d10026 100644
--- a/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../../src/app/zap-templates/zcl/zcl.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
index 35ef901c3b9f65..ce152258141be6 100644
--- a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter
@@ -431,6 +431,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap
index 48552d87ad403e..0ecf2a4c40628c 100644
--- a/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.zap
@@ -17,12 +17,6 @@
     }
   ],
   "package": [
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
-    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../../src/app/zap-templates/zcl/zcl.json",
@@ -30,6 +24,12 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter b/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter
index 160acb9baee5ec..1ed69131b9f121 100644
--- a/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter
+++ b/examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter
@@ -947,6 +947,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index c58319bcdb6c05..c864c7b7e770d7 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -712,6 +712,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/light-switch-app/qpg/zap/switch.matter b/examples/light-switch-app/qpg/zap/switch.matter
index c7e6aab7706e6a..fd3358839b9653 100644
--- a/examples/light-switch-app/qpg/zap/switch.matter
+++ b/examples/light-switch-app/qpg/zap/switch.matter
@@ -776,6 +776,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
index 1608074b03f617..bf2c20579fca4c 100644
--- a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
+++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
@@ -457,6 +457,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 786830c766f128..213f7de33d00f0 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -733,6 +733,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
index 3680f906f364d1..66ba05da23e46b 100644
--- a/examples/lock-app/nxp/zap/lock-app.matter
+++ b/examples/lock-app/nxp/zap/lock-app.matter
@@ -277,6 +277,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter
index bbd1d3188f2788..8bad95d408fbfa 100644
--- a/examples/lock-app/qpg/zap/lock.matter
+++ b/examples/lock-app/qpg/zap/lock.matter
@@ -508,6 +508,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter
index 4ea15da34fdb84..91d83364d6c689 100644
--- a/examples/log-source-app/log-source-common/log-source-app.matter
+++ b/examples/log-source-app/log-source-common/log-source-app.matter
@@ -97,6 +97,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.matter b/examples/network-manager-app/network-manager-common/network-manager-app.matter
index f094b38d4d48ec..9a06361d03a9b2 100644
--- a/examples/network-manager-app/network-manager-common/network-manager-app.matter
+++ b/examples/network-manager-app/network-manager-common/network-manager-app.matter
@@ -277,6 +277,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.zap b/examples/network-manager-app/network-manager-common/network-manager-app.zap
index f3ac2d36034af7..11bafc2fea5c3b 100644
--- a/examples/network-manager-app/network-manager-common/network-manager-app.zap
+++ b/examples/network-manager-app/network-manager-common/network-manager-app.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
index 6276687928ab87..f6ee68191eddc8 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -641,6 +641,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index 95f0adabed36b4..caaa28a3bc96d2 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -1364,6 +1364,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
@@ -1452,6 +1456,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index d8b2f7ab99bef3..63e9ce5cdcb88b 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -1321,6 +1321,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
@@ -1409,6 +1413,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index be14e9df6f9631..2d850cb8f008f9 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -649,6 +649,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter
index 4ae1250c0e4fe8..129599e676264e 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter
@@ -649,6 +649,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.zap b/examples/pump-app/silabs/data_model/pump-thread-app.zap
index c9f15411df0960..40786a536bb885 100644
--- a/examples/pump-app/silabs/data_model/pump-thread-app.zap
+++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap
@@ -17,6 +17,12 @@
     }
   ],
   "package": [
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
+    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../../src/app/zap-templates/zcl/zcl.json",
@@ -24,12 +30,6 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
-    },
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
index 4ae1250c0e4fe8..129599e676264e 100644
--- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter
+++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter
@@ -649,6 +649,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index d7f705e5770f7e..da99989493f181 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -524,6 +524,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
index 10f8450a4d1327..cd3ee2a7fc30b5 100644
--- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
+++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
@@ -828,6 +828,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
index acde9c60a5f027..4a6d6d0a318788 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
@@ -468,6 +468,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
index 223d3b506db8a0..387eb645c62eb9 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter
@@ -925,6 +925,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
index 30739835eef487..445f06bd9fb1f5 100644
--- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
+++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter
@@ -925,6 +925,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
index 4e953ffcf8e609..6a6ca9fb56f4f7 100644
--- a/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
+++ b/examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter
@@ -605,6 +605,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 968d679ab7fab3..0c141851758698 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -666,6 +666,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index 7b031aa3636f51..10170c18ef0669 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -629,6 +629,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
@@ -717,6 +721,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index 4da8afaadcbdf1..5e84c729fe7f4f 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -713,6 +713,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap
index 6d6e9be83539b6..8c6f0bf41d5935 100644
--- a/scripts/tools/zap/tests/inputs/lighting-app.zap
+++ b/scripts/tools/zap/tests/inputs/lighting-app.zap
@@ -17,12 +17,6 @@
     }
   ],
   "package": [
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "version": "chip-v1"
-    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../../../src/app/zap-templates/zcl/zcl.json",
@@ -30,6 +24,12 @@
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 93f24bd8e19d5f..11b9d125c67a9d 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -1309,6 +1309,10 @@ cluster GeneralCommissioning = 48 {
     kIndoorOutdoor = 2;
   }
 
+  bitmap Feature : bitmap32 {
+    kTermsAndConditions = 0x1;
+  }
+
   struct BasicCommissioningInfo {
     int16u failSafeExpiryLengthSeconds = 0;
     int16u maxCumulativeFailsafeSeconds = 1;
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 9b303abb8a5a89..df078b7a3b6381 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -6445,6 +6445,10 @@ class RegulatoryLocationTypeEnum(MatterIntEnum):
             # enum value. This specific should never be transmitted.
             kUnknownEnumValue = 3,
 
+    class Bitmaps:
+        class Feature(IntFlag):
+            kTermsAndConditions = 0x1
+
     class Structs:
         @dataclass
         class BasicCommissioningInfo(ClusterObject):
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index c3e2bc0ea590ff..84493fb445f60e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -16909,6 +16909,10 @@ typedef NS_ENUM(uint8_t, MTRGeneralCommissioningRegulatoryLocationType) {
     MTRGeneralCommissioningRegulatoryLocationTypeIndoorOutdoor MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
 } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_OPTIONS(uint32_t, MTRGeneralCommissioningFeature) {
+    MTRGeneralCommissioningFeatureTermsAndConditions MTR_PROVISIONALLY_AVAILABLE = 0x1,
+} MTR_PROVISIONALLY_AVAILABLE;
+
 typedef NS_ENUM(uint8_t, MTRNetworkCommissioningStatus) {
     MTRNetworkCommissioningStatusSuccess MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
     MTRNetworkCommissioningStatusOutOfRange MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
index 6e95a31ec83f1a..385372bce176d4 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
@@ -984,6 +984,12 @@ enum class RegulatoryLocationTypeEnum : uint8_t
     // enum value. This specific should never be transmitted.
     kUnknownEnumValue = 3,
 };
+
+// Bitmap for Feature
+enum class Feature : uint32_t
+{
+    kTermsAndConditions = 0x1,
+};
 } // namespace GeneralCommissioning
 
 namespace NetworkCommissioning {