From 5bb7e902748063116e4dbbb2228d82592f089efe Mon Sep 17 00:00:00 2001
From: Justin Wood <woody@apple.com>
Date: Fri, 1 Jul 2022 11:00:17 -0700
Subject: [PATCH] Fixing extra space

---
 .../CHIPTool/Framework Helpers/FabricKeys.h   |   1 +
 src/darwin/Framework/CHIP/MTRCluster.h        |   3 +
 .../zap-generated/MTRCommandPayloadsObjc.h    | 299 ++++++++++++++++++
 .../CHIP/zap-generated/MTRStructsObjc.h       |  60 ++++
 src/darwin/Framework/CHIPTests/MTRTestKeys.h  |   1 +
 5 files changed, 364 insertions(+)

diff --git a/src/darwin/CHIPTool/CHIPTool/Framework Helpers/FabricKeys.h b/src/darwin/CHIPTool/CHIPTool/Framework Helpers/FabricKeys.h
index dcf33c1343faa2..01a215717e172c 100644
--- a/src/darwin/CHIPTool/CHIPTool/Framework Helpers/FabricKeys.h	
+++ b/src/darwin/CHIPTool/CHIPTool/Framework Helpers/FabricKeys.h	
@@ -30,6 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly, nonatomic, strong) NSData * ipk;
 
 - (instancetype)init;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/MTRCluster.h b/src/darwin/Framework/CHIP/MTRCluster.h
index f9b90772e83988..75ba8c1c7f84f9 100644
--- a/src/darwin/Framework/CHIP/MTRCluster.h
+++ b/src/darwin/Framework/CHIP/MTRCluster.h
@@ -68,6 +68,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * dataVersion;
 
 - (instancetype)init;
+
 @end
 
 /**
@@ -91,6 +92,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * fabricFiltered;
 
 - (instancetype)init;
+
 @end
 
 /**
@@ -127,6 +129,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * autoResubscribe;
 
 - (instancetype)init;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
index 69947fa6c556aa..d45a346e62b3d8 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
@@ -45,6 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRIdentifyClusterTriggerEffectParams : NSObject
 
@@ -68,6 +69,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupsClusterAddGroupParams : NSObject
 
@@ -91,6 +93,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupsClusterAddGroupResponseParams : NSObject
 
@@ -114,6 +117,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupsClusterViewGroupParams : NSObject
 
@@ -135,6 +139,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupsClusterViewGroupResponseParams : NSObject
 
@@ -160,6 +165,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupsClusterGetGroupMembershipParams : NSObject
 
@@ -181,6 +187,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupsClusterGetGroupMembershipResponseParams : NSObject
 
@@ -204,6 +211,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupsClusterRemoveGroupParams : NSObject
 
@@ -225,6 +233,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupsClusterRemoveGroupResponseParams : NSObject
 
@@ -248,6 +257,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupsClusterRemoveAllGroupsParams : NSObject
 /**
@@ -267,6 +277,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupsClusterAddGroupIfIdentifyingParams : NSObject
 
@@ -290,6 +301,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterAddSceneParams : NSObject
 
@@ -319,6 +331,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterAddSceneResponseParams : NSObject
 
@@ -344,6 +357,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterViewSceneParams : NSObject
 
@@ -367,6 +381,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterViewSceneResponseParams : NSObject
 
@@ -398,6 +413,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterRemoveSceneParams : NSObject
 
@@ -421,6 +437,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterRemoveSceneResponseParams : NSObject
 
@@ -446,6 +463,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterRemoveAllScenesParams : NSObject
 
@@ -467,6 +485,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterRemoveAllScenesResponseParams : NSObject
 
@@ -490,6 +509,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterStoreSceneParams : NSObject
 
@@ -513,6 +533,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterStoreSceneResponseParams : NSObject
 
@@ -538,6 +559,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterRecallSceneParams : NSObject
 
@@ -563,6 +585,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterGetSceneMembershipParams : NSObject
 
@@ -584,6 +607,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterGetSceneMembershipResponseParams : NSObject
 
@@ -611,6 +635,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterEnhancedAddSceneParams : NSObject
 
@@ -640,6 +665,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterEnhancedAddSceneResponseParams : NSObject
 
@@ -665,6 +691,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterEnhancedViewSceneParams : NSObject
 
@@ -688,6 +715,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterEnhancedViewSceneResponseParams : NSObject
 
@@ -719,6 +747,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterCopySceneParams : NSObject
 
@@ -748,6 +777,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRScenesClusterCopySceneResponseParams : NSObject
 
@@ -773,6 +803,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROnOffClusterOffParams : NSObject
 /**
@@ -792,6 +823,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROnOffClusterOnParams : NSObject
 /**
@@ -811,6 +843,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROnOffClusterToggleParams : NSObject
 /**
@@ -830,6 +863,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROnOffClusterOffWithEffectParams : NSObject
 
@@ -853,6 +887,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROnOffClusterOnWithRecallGlobalSceneParams : NSObject
 /**
@@ -872,6 +907,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROnOffClusterOnWithTimedOffParams : NSObject
 
@@ -897,6 +933,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRLevelControlClusterMoveToLevelParams : NSObject
 
@@ -924,6 +961,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRLevelControlClusterMoveParams : NSObject
 
@@ -951,6 +989,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRLevelControlClusterStepParams : NSObject
 
@@ -980,6 +1019,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRLevelControlClusterStopParams : NSObject
 
@@ -1003,6 +1043,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRLevelControlClusterMoveToLevelWithOnOffParams : NSObject
 
@@ -1026,6 +1067,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRLevelControlClusterMoveWithOnOffParams : NSObject
 
@@ -1049,6 +1091,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRLevelControlClusterStepWithOnOffParams : NSObject
 
@@ -1074,6 +1117,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRLevelControlClusterStopWithOnOffParams : NSObject
 /**
@@ -1093,6 +1137,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRLevelControlClusterMoveToClosestFrequencyParams : NSObject
 
@@ -1114,6 +1159,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAlarmsClusterResetAlarmParams : NSObject
 
@@ -1137,6 +1183,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAlarmsClusterAlarmParams : NSObject
 
@@ -1160,6 +1207,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAlarmsClusterResetAllAlarmsParams : NSObject
 /**
@@ -1179,6 +1227,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAlarmsClusterGetAlarmResponseParams : NSObject
 
@@ -1206,6 +1255,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAlarmsClusterGetAlarmParams : NSObject
 /**
@@ -1225,6 +1275,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAlarmsClusterResetAlarmLogParams : NSObject
 /**
@@ -1244,6 +1295,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterPowerProfileRequestParams : NSObject
 
@@ -1265,6 +1317,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterPowerProfileNotificationParams : NSObject
 
@@ -1292,6 +1345,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterPowerProfileStateRequestParams : NSObject
 /**
@@ -1311,6 +1365,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterPowerProfileResponseParams : NSObject
 
@@ -1338,6 +1393,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterGetPowerProfilePriceResponseParams : NSObject
 
@@ -1365,6 +1421,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterPowerProfileStateResponseParams : NSObject
 
@@ -1388,6 +1445,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterGetOverallSchedulePriceResponseParams : NSObject
 
@@ -1413,6 +1471,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterGetPowerProfilePriceParams : NSObject
 
@@ -1434,6 +1493,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterEnergyPhasesScheduleNotificationParams : NSObject
 
@@ -1459,6 +1519,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterPowerProfilesStateNotificationParams : NSObject
 
@@ -1482,6 +1543,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterEnergyPhasesScheduleResponseParams : NSObject
 
@@ -1507,6 +1569,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterGetOverallSchedulePriceParams : NSObject
 /**
@@ -1526,6 +1589,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterPowerProfileScheduleConstraintsRequestParams : NSObject
 
@@ -1547,6 +1611,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterEnergyPhasesScheduleRequestParams : NSObject
 
@@ -1568,6 +1633,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterEnergyPhasesScheduleStateRequestParams : NSObject
 
@@ -1589,6 +1655,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterEnergyPhasesScheduleStateResponseParams : NSObject
 
@@ -1614,6 +1681,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterGetPowerProfilePriceExtendedResponseParams : NSObject
 
@@ -1641,6 +1709,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterEnergyPhasesScheduleStateNotificationParams : NSObject
 
@@ -1666,6 +1735,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterPowerProfileScheduleConstraintsNotificationParams : NSObject
 
@@ -1691,6 +1761,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterPowerProfileScheduleConstraintsResponseParams : NSObject
 
@@ -1716,6 +1787,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPowerProfileClusterGetPowerProfilePriceExtendedParams : NSObject
 
@@ -1741,6 +1813,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceControlClusterExecutionOfACommandParams : NSObject
 
@@ -1762,6 +1835,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceControlClusterSignalStateResponseParams : NSObject
 
@@ -1787,6 +1861,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceControlClusterSignalStateParams : NSObject
 /**
@@ -1806,6 +1881,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceControlClusterSignalStateNotificationParams : NSObject
 
@@ -1831,6 +1907,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceControlClusterWriteFunctionsParams : NSObject
 
@@ -1856,6 +1933,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceControlClusterOverloadPauseResumeParams : NSObject
 /**
@@ -1875,6 +1953,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceControlClusterOverloadPauseParams : NSObject
 /**
@@ -1894,6 +1973,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceControlClusterOverloadWarningParams : NSObject
 
@@ -1915,6 +1995,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPollControlClusterCheckInParams : NSObject
 /**
@@ -1934,6 +2015,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPollControlClusterCheckInResponseParams : NSObject
 
@@ -1957,6 +2039,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPollControlClusterFastPollStopParams : NSObject
 /**
@@ -1976,6 +2059,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPollControlClusterSetLongPollIntervalParams : NSObject
 
@@ -1997,6 +2081,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRPollControlClusterSetShortPollIntervalParams : NSObject
 
@@ -2018,6 +2103,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterInstantActionParams : NSObject
 
@@ -2041,6 +2127,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterInstantActionWithTransitionParams : NSObject
 
@@ -2066,6 +2153,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterStartActionParams : NSObject
 
@@ -2089,6 +2177,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterStartActionWithDurationParams : NSObject
 
@@ -2114,6 +2203,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterStopActionParams : NSObject
 
@@ -2137,6 +2227,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterPauseActionParams : NSObject
 
@@ -2160,6 +2251,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterPauseActionWithDurationParams : NSObject
 
@@ -2185,6 +2277,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterResumeActionParams : NSObject
 
@@ -2208,6 +2301,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterEnableActionParams : NSObject
 
@@ -2231,6 +2325,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterEnableActionWithDurationParams : NSObject
 
@@ -2256,6 +2351,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterDisableActionParams : NSObject
 
@@ -2279,6 +2375,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBridgedActionsClusterDisableActionWithDurationParams : NSObject
 
@@ -2304,6 +2401,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBasicClusterMfgSpecificPingParams : NSObject
 /**
@@ -2323,6 +2421,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROtaSoftwareUpdateProviderClusterQueryImageParams : NSObject
 
@@ -2358,6 +2457,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROtaSoftwareUpdateProviderClusterQueryImageResponseParams : NSObject
 
@@ -2393,6 +2493,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROtaSoftwareUpdateProviderClusterApplyUpdateRequestParams : NSObject
 
@@ -2416,6 +2517,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROtaSoftwareUpdateProviderClusterApplyUpdateResponseParams : NSObject
 
@@ -2439,6 +2541,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROtaSoftwareUpdateProviderClusterNotifyUpdateAppliedParams : NSObject
 
@@ -2462,6 +2565,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROtaSoftwareUpdateRequestorClusterAnnounceOtaProviderParams : NSObject
 
@@ -2491,6 +2595,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGeneralCommissioningClusterArmFailSafeParams : NSObject
 
@@ -2514,6 +2619,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGeneralCommissioningClusterArmFailSafeResponseParams : NSObject
 
@@ -2537,6 +2643,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGeneralCommissioningClusterSetRegulatoryConfigParams : NSObject
 
@@ -2562,6 +2669,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGeneralCommissioningClusterSetRegulatoryConfigResponseParams : NSObject
 
@@ -2585,6 +2693,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGeneralCommissioningClusterCommissioningCompleteParams : NSObject
 /**
@@ -2604,6 +2713,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGeneralCommissioningClusterCommissioningCompleteResponseParams : NSObject
 
@@ -2627,6 +2737,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRNetworkCommissioningClusterScanNetworksParams : NSObject
 
@@ -2650,6 +2761,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRNetworkCommissioningClusterScanNetworksResponseParams : NSObject
 
@@ -2677,6 +2789,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRNetworkCommissioningClusterAddOrUpdateWiFiNetworkParams : NSObject
 
@@ -2702,6 +2815,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRNetworkCommissioningClusterAddOrUpdateThreadNetworkParams : NSObject
 
@@ -2725,6 +2839,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRNetworkCommissioningClusterRemoveNetworkParams : NSObject
 
@@ -2748,6 +2863,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRNetworkCommissioningClusterNetworkConfigResponseParams : NSObject
 
@@ -2773,6 +2889,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRNetworkCommissioningClusterConnectNetworkParams : NSObject
 
@@ -2796,6 +2913,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRNetworkCommissioningClusterConnectNetworkResponseParams : NSObject
 
@@ -2821,6 +2939,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRNetworkCommissioningClusterReorderNetworkParams : NSObject
 
@@ -2846,6 +2965,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDiagnosticLogsClusterRetrieveLogsRequestParams : NSObject
 
@@ -2871,6 +2991,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDiagnosticLogsClusterRetrieveLogsResponseParams : NSObject
 
@@ -2898,6 +3019,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGeneralDiagnosticsClusterTestEventTriggerParams : NSObject
 
@@ -2921,6 +3043,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRSoftwareDiagnosticsClusterResetWatermarksParams : NSObject
 /**
@@ -2940,6 +3063,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRThreadNetworkDiagnosticsClusterResetCountsParams : NSObject
 /**
@@ -2959,6 +3083,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRWiFiNetworkDiagnosticsClusterResetCountsParams : NSObject
 /**
@@ -2978,6 +3103,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTREthernetNetworkDiagnosticsClusterResetCountsParams : NSObject
 /**
@@ -2997,6 +3123,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAdministratorCommissioningClusterOpenCommissioningWindowParams : NSObject
 
@@ -3026,6 +3153,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAdministratorCommissioningClusterOpenBasicCommissioningWindowParams : NSObject
 
@@ -3047,6 +3175,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAdministratorCommissioningClusterRevokeCommissioningParams : NSObject
 /**
@@ -3066,6 +3195,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterAttestationRequestParams : NSObject
 
@@ -3087,6 +3217,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterAttestationResponseParams : NSObject
 
@@ -3110,6 +3241,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterCertificateChainRequestParams : NSObject
 
@@ -3131,6 +3263,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterCertificateChainResponseParams : NSObject
 
@@ -3152,6 +3285,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterCSRRequestParams : NSObject
 
@@ -3175,6 +3309,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterCSRResponseParams : NSObject
 
@@ -3198,6 +3333,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterAddNOCParams : NSObject
 
@@ -3227,6 +3363,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterUpdateNOCParams : NSObject
 
@@ -3250,6 +3387,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterNOCResponseParams : NSObject
 
@@ -3275,6 +3413,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterUpdateFabricLabelParams : NSObject
 
@@ -3296,6 +3435,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterRemoveFabricParams : NSObject
 
@@ -3317,6 +3457,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTROperationalCredentialsClusterAddTrustedRootCertificateParams : NSObject
 
@@ -3338,6 +3479,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupKeyManagementClusterKeySetWriteParams : NSObject
 
@@ -3359,6 +3501,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupKeyManagementClusterKeySetReadParams : NSObject
 
@@ -3380,6 +3523,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupKeyManagementClusterKeySetReadResponseParams : NSObject
 
@@ -3401,6 +3545,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupKeyManagementClusterKeySetRemoveParams : NSObject
 
@@ -3422,6 +3567,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupKeyManagementClusterKeySetReadAllIndicesParams : NSObject
 
@@ -3443,6 +3589,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRGroupKeyManagementClusterKeySetReadAllIndicesResponseParams : NSObject
 
@@ -3464,6 +3611,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRModeSelectClusterChangeToModeParams : NSObject
 
@@ -3485,6 +3633,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterLockDoorParams : NSObject
 
@@ -3506,6 +3655,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterUnlockDoorParams : NSObject
 
@@ -3527,6 +3677,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterUnlockWithTimeoutParams : NSObject
 
@@ -3550,6 +3701,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterSetWeekDayScheduleParams : NSObject
 
@@ -3583,6 +3735,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterGetWeekDayScheduleParams : NSObject
 
@@ -3606,6 +3759,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterGetWeekDayScheduleResponseParams : NSObject
 
@@ -3641,6 +3795,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterClearWeekDayScheduleParams : NSObject
 
@@ -3664,6 +3819,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterSetYearDayScheduleParams : NSObject
 
@@ -3691,6 +3847,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterGetYearDayScheduleParams : NSObject
 
@@ -3714,6 +3871,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterGetYearDayScheduleResponseParams : NSObject
 
@@ -3743,6 +3901,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterClearYearDayScheduleParams : NSObject
 
@@ -3766,6 +3925,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterSetHolidayScheduleParams : NSObject
 
@@ -3793,6 +3953,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterGetHolidayScheduleParams : NSObject
 
@@ -3814,6 +3975,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterGetHolidayScheduleResponseParams : NSObject
 
@@ -3843,6 +4005,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterClearHolidayScheduleParams : NSObject
 
@@ -3864,6 +4027,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterSetUserParams : NSObject
 
@@ -3897,6 +4061,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterGetUserParams : NSObject
 
@@ -3918,6 +4083,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterGetUserResponseParams : NSObject
 
@@ -3957,6 +4123,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterClearUserParams : NSObject
 
@@ -3978,6 +4145,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterSetCredentialParams : NSObject
 
@@ -4009,6 +4177,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterSetCredentialResponseParams : NSObject
 
@@ -4034,6 +4203,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterGetCredentialStatusParams : NSObject
 
@@ -4055,6 +4225,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterGetCredentialStatusResponseParams : NSObject
 
@@ -4084,6 +4255,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRDoorLockClusterClearCredentialParams : NSObject
 
@@ -4105,6 +4277,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRWindowCoveringClusterUpOrOpenParams : NSObject
 /**
@@ -4124,6 +4297,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRWindowCoveringClusterDownOrCloseParams : NSObject
 /**
@@ -4143,6 +4317,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRWindowCoveringClusterStopMotionParams : NSObject
 /**
@@ -4162,6 +4337,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRWindowCoveringClusterGoToLiftValueParams : NSObject
 
@@ -4183,6 +4359,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRWindowCoveringClusterGoToLiftPercentageParams : NSObject
 
@@ -4204,6 +4381,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRWindowCoveringClusterGoToTiltValueParams : NSObject
 
@@ -4225,6 +4403,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRWindowCoveringClusterGoToTiltPercentageParams : NSObject
 
@@ -4246,6 +4425,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBarrierControlClusterBarrierControlGoToPercentParams : NSObject
 
@@ -4267,6 +4447,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRBarrierControlClusterBarrierControlStopParams : NSObject
 /**
@@ -4286,6 +4467,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRThermostatClusterSetpointRaiseLowerParams : NSObject
 
@@ -4309,6 +4491,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRThermostatClusterGetWeeklyScheduleResponseParams : NSObject
 
@@ -4336,6 +4519,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRThermostatClusterSetWeeklyScheduleParams : NSObject
 
@@ -4363,6 +4547,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRThermostatClusterGetWeeklyScheduleParams : NSObject
 
@@ -4386,6 +4571,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRThermostatClusterClearWeeklyScheduleParams : NSObject
 /**
@@ -4405,6 +4591,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterMoveToHueParams : NSObject
 
@@ -4434,6 +4621,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterMoveHueParams : NSObject
 
@@ -4461,6 +4649,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterStepHueParams : NSObject
 
@@ -4490,6 +4679,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterMoveToSaturationParams : NSObject
 
@@ -4517,6 +4707,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterMoveSaturationParams : NSObject
 
@@ -4544,6 +4735,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterStepSaturationParams : NSObject
 
@@ -4573,6 +4765,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterMoveToHueAndSaturationParams : NSObject
 
@@ -4602,6 +4795,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterMoveToColorParams : NSObject
 
@@ -4631,6 +4825,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterMoveColorParams : NSObject
 
@@ -4658,6 +4853,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterStepColorParams : NSObject
 
@@ -4687,6 +4883,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterMoveToColorTemperatureParams : NSObject
 
@@ -4714,6 +4911,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterEnhancedMoveToHueParams : NSObject
 
@@ -4743,6 +4941,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterEnhancedMoveHueParams : NSObject
 
@@ -4770,6 +4969,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterEnhancedStepHueParams : NSObject
 
@@ -4799,6 +4999,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterEnhancedMoveToHueAndSaturationParams : NSObject
 
@@ -4828,6 +5029,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterColorLoopSetParams : NSObject
 
@@ -4861,6 +5063,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterStopMoveStepParams : NSObject
 
@@ -4884,6 +5087,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterMoveColorTemperatureParams : NSObject
 
@@ -4915,6 +5119,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRColorControlClusterStepColorTemperatureParams : NSObject
 
@@ -4948,6 +5153,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRChannelClusterChangeChannelParams : NSObject
 
@@ -4969,6 +5175,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRChannelClusterChangeChannelResponseParams : NSObject
 
@@ -4992,6 +5199,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRChannelClusterChangeChannelByNumberParams : NSObject
 
@@ -5015,6 +5223,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRChannelClusterSkipChannelParams : NSObject
 
@@ -5036,6 +5245,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTargetNavigatorClusterNavigateTargetParams : NSObject
 
@@ -5059,6 +5269,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTargetNavigatorClusterNavigateTargetResponseParams : NSObject
 
@@ -5082,6 +5293,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterPlayParams : NSObject
 /**
@@ -5101,6 +5313,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterPauseParams : NSObject
 /**
@@ -5120,6 +5333,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterStopPlaybackParams : NSObject
 /**
@@ -5139,6 +5353,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterStartOverParams : NSObject
 /**
@@ -5158,6 +5373,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterPreviousParams : NSObject
 /**
@@ -5177,6 +5393,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterNextParams : NSObject
 /**
@@ -5196,6 +5413,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterRewindParams : NSObject
 /**
@@ -5215,6 +5433,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterFastForwardParams : NSObject
 /**
@@ -5234,6 +5453,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterSkipForwardParams : NSObject
 
@@ -5255,6 +5475,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterSkipBackwardParams : NSObject
 
@@ -5276,6 +5497,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterPlaybackResponseParams : NSObject
 
@@ -5299,6 +5521,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaPlaybackClusterSeekParams : NSObject
 
@@ -5320,6 +5543,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaInputClusterSelectInputParams : NSObject
 
@@ -5341,6 +5565,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaInputClusterShowInputStatusParams : NSObject
 /**
@@ -5360,6 +5585,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaInputClusterHideInputStatusParams : NSObject
 /**
@@ -5379,6 +5605,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMediaInputClusterRenameInputParams : NSObject
 
@@ -5402,6 +5629,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRLowPowerClusterSleepParams : NSObject
 /**
@@ -5421,6 +5649,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRKeypadInputClusterSendKeyParams : NSObject
 
@@ -5442,6 +5671,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRKeypadInputClusterSendKeyResponseParams : NSObject
 
@@ -5463,6 +5693,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRContentLauncherClusterLaunchContentParams : NSObject
 
@@ -5488,6 +5719,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRContentLauncherClusterLaunchURLParams : NSObject
 
@@ -5513,6 +5745,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRContentLauncherClusterLaunchResponseParams : NSObject
 
@@ -5536,6 +5769,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAudioOutputClusterSelectOutputParams : NSObject
 
@@ -5557,6 +5791,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAudioOutputClusterRenameOutputParams : NSObject
 
@@ -5580,6 +5815,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplicationLauncherClusterLaunchAppParams : NSObject
 
@@ -5603,6 +5839,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplicationLauncherClusterStopAppParams : NSObject
 
@@ -5624,6 +5861,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplicationLauncherClusterHideAppParams : NSObject
 
@@ -5645,6 +5883,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplicationLauncherClusterLauncherResponseParams : NSObject
 
@@ -5668,6 +5907,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAccountLoginClusterGetSetupPINParams : NSObject
 
@@ -5689,6 +5929,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAccountLoginClusterGetSetupPINResponseParams : NSObject
 
@@ -5710,6 +5951,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAccountLoginClusterLoginParams : NSObject
 
@@ -5733,6 +5975,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRAccountLoginClusterLogoutParams : NSObject
 /**
@@ -5752,6 +5995,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMessagingClusterDisplayMessageParams : NSObject
 
@@ -5783,6 +6027,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMessagingClusterGetLastMessageParams : NSObject
 /**
@@ -5802,6 +6047,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMessagingClusterCancelMessageParams : NSObject
 
@@ -5825,6 +6071,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMessagingClusterMessageConfirmationParams : NSObject
 
@@ -5852,6 +6099,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMessagingClusterDisplayProtectedMessageParams : NSObject
 
@@ -5883,6 +6131,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMessagingClusterGetMessageCancellationParams : NSObject
 
@@ -5904,6 +6153,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRMessagingClusterCancelAllMessagesParams : NSObject
 
@@ -5925,6 +6175,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceEventsAndAlertClusterGetAlertsParams : NSObject
 /**
@@ -5944,6 +6195,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceEventsAndAlertClusterGetAlertsResponseParams : NSObject
 
@@ -5967,6 +6219,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceEventsAndAlertClusterAlertsNotificationParams : NSObject
 
@@ -5990,6 +6243,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceEventsAndAlertClusterEventsNotificationParams : NSObject
 
@@ -6013,6 +6267,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceStatisticsClusterLogNotificationParams : NSObject
 
@@ -6040,6 +6295,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceStatisticsClusterLogRequestParams : NSObject
 
@@ -6061,6 +6317,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceStatisticsClusterLogResponseParams : NSObject
 
@@ -6088,6 +6345,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceStatisticsClusterLogQueueRequestParams : NSObject
 /**
@@ -6107,6 +6365,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceStatisticsClusterLogQueueResponseParams : NSObject
 
@@ -6130,6 +6389,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRApplianceStatisticsClusterStatisticsAvailableParams : NSObject
 
@@ -6153,6 +6413,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRElectricalMeasurementClusterGetProfileInfoResponseCommandParams : NSObject
 
@@ -6180,6 +6441,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRElectricalMeasurementClusterGetProfileInfoCommandParams : NSObject
 /**
@@ -6199,6 +6461,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRElectricalMeasurementClusterGetMeasurementProfileResponseCommandParams : NSObject
 
@@ -6230,6 +6493,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRElectricalMeasurementClusterGetMeasurementProfileCommandParams : NSObject
 
@@ -6255,6 +6519,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestParams : NSObject
 /**
@@ -6274,6 +6539,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestSpecificResponseParams : NSObject
 
@@ -6295,6 +6561,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestNotHandledParams : NSObject
 /**
@@ -6314,6 +6581,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestAddArgumentsResponseParams : NSObject
 
@@ -6335,6 +6603,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestSpecificParams : NSObject
 /**
@@ -6354,6 +6623,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestSimpleArgumentResponseParams : NSObject
 
@@ -6375,6 +6645,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestUnknownCommandParams : NSObject
 /**
@@ -6394,6 +6665,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestStructArrayArgumentResponseParams : NSObject
 
@@ -6425,6 +6697,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestAddArgumentsParams : NSObject
 
@@ -6448,6 +6721,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestListInt8UReverseResponseParams : NSObject
 
@@ -6469,6 +6743,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestSimpleArgumentRequestParams : NSObject
 
@@ -6490,6 +6765,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestEnumsResponseParams : NSObject
 
@@ -6513,6 +6789,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestStructArrayArgumentRequestParams : NSObject
 
@@ -6544,6 +6821,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestNullableOptionalResponseParams : NSObject
 
@@ -6571,6 +6849,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestStructArgumentRequestParams : NSObject
 
@@ -6592,6 +6871,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestComplexNullableOptionalResponseParams : NSObject
 
@@ -6667,6 +6947,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestNestedStructArgumentRequestParams : NSObject
 
@@ -6688,6 +6969,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterBooleanResponseParams : NSObject
 
@@ -6709,6 +6991,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestListStructArgumentRequestParams : NSObject
 
@@ -6730,6 +7013,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterSimpleStructResponseParams : NSObject
 
@@ -6751,6 +7035,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestListInt8UArgumentRequestParams : NSObject
 
@@ -6772,6 +7057,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestEmitTestEventResponseParams : NSObject
 
@@ -6793,6 +7079,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestNestedStructListArgumentRequestParams : NSObject
 
@@ -6814,6 +7101,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestEmitTestFabricScopedEventResponseParams : NSObject
 
@@ -6835,6 +7123,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestListNestedStructListArgumentRequestParams : NSObject
 
@@ -6856,6 +7145,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestListInt8UReverseRequestParams : NSObject
 
@@ -6877,6 +7167,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestEnumsRequestParams : NSObject
 
@@ -6900,6 +7191,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestNullableOptionalRequestParams : NSObject
 
@@ -6921,6 +7213,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestComplexNullableOptionalRequestParams : NSObject
 
@@ -6964,6 +7257,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterSimpleStructEchoRequestParams : NSObject
 
@@ -6985,6 +7279,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTimedInvokeRequestParams : NSObject
 /**
@@ -7004,6 +7299,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestSimpleOptionalArgumentRequestParams : NSObject
 
@@ -7025,6 +7321,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestEmitTestEventRequestParams : NSObject
 
@@ -7050,6 +7347,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 @interface MTRTestClusterClusterTestEmitTestFabricScopedEventRequestParams : NSObject
 
@@ -7071,6 +7369,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs;
 
 - (instancetype)init;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index 40a70a326d6cd1..b8f77848ffb1da 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -28,12 +28,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nullable attributeId;
 @property (strong, nonatomic) NSArray * _Nonnull attributeValue;
 - (instancetype)init;
+
 @end
 
 @interface MTRScenesClusterExtensionFieldSet : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull clusterId;
 @property (strong, nonatomic) NSArray * _Nonnull attributeValueList;
 - (instancetype)init;
+
 @end
 
 @interface MTRPowerProfileClusterPowerProfileRecord : NSObject
@@ -42,12 +44,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull powerProfileRemoteControl;
 @property (strong, nonatomic) NSNumber * _Nonnull powerProfileState;
 - (instancetype)init;
+
 @end
 
 @interface MTRPowerProfileClusterScheduledPhase : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull energyPhaseId;
 @property (strong, nonatomic) NSNumber * _Nonnull scheduledTime;
 - (instancetype)init;
+
 @end
 
 @interface MTRPowerProfileClusterTransferredPhase : NSObject
@@ -58,12 +62,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull energy;
 @property (strong, nonatomic) NSNumber * _Nonnull maxActivationDelay;
 - (instancetype)init;
+
 @end
 
 @interface MTRDescriptorClusterDeviceType : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull type;
 @property (strong, nonatomic) NSNumber * _Nonnull revision;
 - (instancetype)init;
+
 @end
 
 @interface MTRBindingClusterTargetStruct : NSObject
@@ -73,6 +79,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nullable cluster;
 @property (strong, nonatomic) NSNumber * _Nonnull fabricIndex;
 - (instancetype)init;
+
 @end
 
 @interface MTRAccessControlClusterTarget : NSObject
@@ -80,6 +87,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nullable endpoint;
 @property (strong, nonatomic) NSNumber * _Nullable deviceType;
 - (instancetype)init;
+
 @end
 
 @interface MTRAccessControlClusterAccessControlEntry : NSObject
@@ -89,12 +97,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSArray * _Nullable targets;
 @property (strong, nonatomic) NSNumber * _Nonnull fabricIndex;
 - (instancetype)init;
+
 @end
 
 @interface MTRAccessControlClusterExtensionEntry : NSObject
 @property (strong, nonatomic) NSData * _Nonnull data;
 @property (strong, nonatomic) NSNumber * _Nonnull fabricIndex;
 - (instancetype)init;
+
 @end
 
 @interface MTRAccessControlClusterAccessControlEntryChangedEvent : NSObject
@@ -121,6 +131,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull supportedCommands;
 @property (strong, nonatomic) NSNumber * _Nonnull status;
 - (instancetype)init;
+
 @end
 
 @interface MTRBridgedActionsClusterEndpointListStruct : NSObject
@@ -129,6 +140,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull type;
 @property (strong, nonatomic) NSArray * _Nonnull endpoints;
 - (instancetype)init;
+
 @end
 
 @interface MTRBridgedActionsClusterStateChangedEvent : NSObject
@@ -148,6 +160,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull caseSessionsPerFabric;
 @property (strong, nonatomic) NSNumber * _Nonnull subscriptionsPerFabric;
 - (instancetype)init;
+
 @end
 
 @interface MTRBasicClusterStartUpEvent : NSObject
@@ -169,6 +182,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull endpoint;
 @property (strong, nonatomic) NSNumber * _Nonnull fabricIndex;
 - (instancetype)init;
+
 @end
 
 @interface MTROtaSoftwareUpdateRequestorClusterStateTransitionEvent : NSObject
@@ -194,30 +208,35 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSArray * _Nonnull current;
 @property (strong, nonatomic) NSArray * _Nonnull previous;
 - (instancetype)init;
+
 @end
 
 @interface MTRPowerSourceClusterBatFaultChangeType : NSObject
 @property (strong, nonatomic) NSArray * _Nonnull current;
 @property (strong, nonatomic) NSArray * _Nonnull previous;
 - (instancetype)init;
+
 @end
 
 @interface MTRPowerSourceClusterWiredFaultChangeType : NSObject
 @property (strong, nonatomic) NSArray * _Nonnull current;
 @property (strong, nonatomic) NSArray * _Nonnull previous;
 - (instancetype)init;
+
 @end
 
 @interface MTRGeneralCommissioningClusterBasicCommissioningInfo : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull failSafeExpiryLengthSeconds;
 @property (strong, nonatomic) NSNumber * _Nonnull maxCumulativeFailsafeSeconds;
 - (instancetype)init;
+
 @end
 
 @interface MTRNetworkCommissioningClusterNetworkInfo : NSObject
 @property (strong, nonatomic) NSData * _Nonnull networkID;
 @property (strong, nonatomic) NSNumber * _Nonnull connected;
 - (instancetype)init;
+
 @end
 
 @interface MTRNetworkCommissioningClusterThreadInterfaceScanResult : NSObject
@@ -230,6 +249,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull rssi;
 @property (strong, nonatomic) NSNumber * _Nonnull lqi;
 - (instancetype)init;
+
 @end
 
 @interface MTRNetworkCommissioningClusterWiFiInterfaceScanResult : NSObject
@@ -240,6 +260,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull wiFiBand;
 @property (strong, nonatomic) NSNumber * _Nonnull rssi;
 - (instancetype)init;
+
 @end
 
 @interface MTRGeneralDiagnosticsClusterNetworkInterfaceType : NSObject
@@ -252,6 +273,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSArray * _Nonnull iPv6Addresses;
 @property (strong, nonatomic) NSNumber * _Nonnull type;
 - (instancetype)init;
+
 @end
 
 @interface MTRGeneralDiagnosticsClusterHardwareFaultChangeEvent : NSObject
@@ -280,6 +302,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nullable stackFreeMinimum;
 @property (strong, nonatomic) NSNumber * _Nullable stackSize;
 - (instancetype)init;
+
 @end
 
 @interface MTRSoftwareDiagnosticsClusterSoftwareFaultEvent : NSObject
@@ -304,6 +327,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull fullNetworkData;
 @property (strong, nonatomic) NSNumber * _Nonnull isChild;
 - (instancetype)init;
+
 @end
 
 @interface MTRThreadNetworkDiagnosticsClusterOperationalDatasetComponents : NSObject
@@ -320,6 +344,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull securityPolicyPresent;
 @property (strong, nonatomic) NSNumber * _Nonnull channelMaskPresent;
 - (instancetype)init;
+
 @end
 
 @interface MTRThreadNetworkDiagnosticsClusterRouteTable : NSObject
@@ -334,12 +359,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull allocated;
 @property (strong, nonatomic) NSNumber * _Nonnull linkEstablished;
 - (instancetype)init;
+
 @end
 
 @interface MTRThreadNetworkDiagnosticsClusterSecurityPolicy : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull rotationTime;
 @property (strong, nonatomic) NSNumber * _Nonnull flags;
 - (instancetype)init;
+
 @end
 
 @interface MTRThreadNetworkDiagnosticsClusterConnectionStatusEvent : NSObject
@@ -411,6 +438,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSString * _Nonnull label;
 @property (strong, nonatomic) NSNumber * _Nonnull fabricIndex;
 - (instancetype)init;
+
 @end
 
 @interface MTROperationalCredentialsClusterNOCStruct : NSObject
@@ -418,6 +446,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSData * _Nullable icac;
 @property (strong, nonatomic) NSNumber * _Nonnull fabricIndex;
 - (instancetype)init;
+
 @end
 
 @interface MTRGroupKeyManagementClusterGroupInfoMapStruct : NSObject
@@ -426,6 +455,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSString * _Nullable groupName;
 @property (strong, nonatomic) NSNumber * _Nonnull fabricIndex;
 - (instancetype)init;
+
 @end
 
 @interface MTRGroupKeyManagementClusterGroupKeyMapStruct : NSObject
@@ -433,6 +463,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull groupKeySetID;
 @property (strong, nonatomic) NSNumber * _Nonnull fabricIndex;
 - (instancetype)init;
+
 @end
 
 @interface MTRGroupKeyManagementClusterGroupKeySetStruct : NSObject
@@ -445,18 +476,21 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSData * _Nullable epochKey2;
 @property (strong, nonatomic) NSNumber * _Nullable epochStartTime2;
 - (instancetype)init;
+
 @end
 
 @interface MTRFixedLabelClusterLabelStruct : NSObject
 @property (strong, nonatomic) NSString * _Nonnull label;
 @property (strong, nonatomic) NSString * _Nonnull value;
 - (instancetype)init;
+
 @end
 
 @interface MTRUserLabelClusterLabelStruct : NSObject
 @property (strong, nonatomic) NSString * _Nonnull label;
 @property (strong, nonatomic) NSString * _Nonnull value;
 - (instancetype)init;
+
 @end
 
 @interface MTRBooleanStateClusterStateChangeEvent : NSObject
@@ -467,6 +501,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull mfgCode;
 @property (strong, nonatomic) NSNumber * _Nonnull value;
 - (instancetype)init;
+
 @end
 
 @interface MTRModeSelectClusterModeOptionStruct : NSObject
@@ -474,12 +509,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull mode;
 @property (strong, nonatomic) NSArray * _Nonnull semanticTags;
 - (instancetype)init;
+
 @end
 
 @interface MTRDoorLockClusterDlCredential : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull credentialType;
 @property (strong, nonatomic) NSNumber * _Nonnull credentialIndex;
 - (instancetype)init;
+
 @end
 
 @interface MTRDoorLockClusterDoorLockAlarmEvent : NSObject
@@ -575,6 +612,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nullable heatSetpoint;
 @property (strong, nonatomic) NSNumber * _Nullable coolSetpoint;
 - (instancetype)init;
+
 @end
 
 @interface MTRChannelClusterChannelInfo : NSObject
@@ -584,6 +622,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSString * _Nullable callSign;
 @property (strong, nonatomic) NSString * _Nullable affiliateCallSign;
 - (instancetype)init;
+
 @end
 
 @interface MTRChannelClusterLineupInfo : NSObject
@@ -592,18 +631,21 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSString * _Nullable postalCode;
 @property (strong, nonatomic) NSNumber * _Nonnull lineupInfoType;
 - (instancetype)init;
+
 @end
 
 @interface MTRTargetNavigatorClusterTargetInfo : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull identifier;
 @property (strong, nonatomic) NSString * _Nonnull name;
 - (instancetype)init;
+
 @end
 
 @interface MTRMediaPlaybackClusterPlaybackPosition : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull updatedAt;
 @property (strong, nonatomic) NSNumber * _Nullable position;
 - (instancetype)init;
+
 @end
 
 @interface MTRMediaInputClusterInputInfo : NSObject
@@ -612,6 +654,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSString * _Nonnull name;
 @property (strong, nonatomic) NSString * _Nonnull descriptionString;
 - (instancetype)init;
+
 @end
 
 @interface MTRContentLauncherClusterDimension : NSObject
@@ -619,12 +662,14 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull height;
 @property (strong, nonatomic) NSNumber * _Nonnull metric;
 - (instancetype)init;
+
 @end
 
 @interface MTRContentLauncherClusterAdditionalInfo : NSObject
 @property (strong, nonatomic) NSString * _Nonnull name;
 @property (strong, nonatomic) NSString * _Nonnull value;
 - (instancetype)init;
+
 @end
 
 @interface MTRContentLauncherClusterParameter : NSObject
@@ -632,11 +677,13 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSString * _Nonnull value;
 @property (strong, nonatomic) NSArray * _Nullable externalIDList;
 - (instancetype)init;
+
 @end
 
 @interface MTRContentLauncherClusterContentSearch : NSObject
 @property (strong, nonatomic) NSArray * _Nonnull parameterList;
 - (instancetype)init;
+
 @end
 
 @interface MTRContentLauncherClusterStyleInformation : NSObject
@@ -644,6 +691,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSString * _Nullable color;
 @property (strong, nonatomic) MTRContentLauncherClusterDimension * _Nullable size;
 - (instancetype)init;
+
 @end
 
 @interface MTRContentLauncherClusterBrandingInformation : NSObject
@@ -654,6 +702,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) MTRContentLauncherClusterStyleInformation * _Nullable splash;
 @property (strong, nonatomic) MTRContentLauncherClusterStyleInformation * _Nullable waterMark;
 - (instancetype)init;
+
 @end
 
 @interface MTRAudioOutputClusterOutputInfo : NSObject
@@ -661,24 +710,28 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull outputType;
 @property (strong, nonatomic) NSString * _Nonnull name;
 - (instancetype)init;
+
 @end
 
 @interface MTRApplicationLauncherClusterApplication : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull catalogVendorId;
 @property (strong, nonatomic) NSString * _Nonnull applicationId;
 - (instancetype)init;
+
 @end
 
 @interface MTRApplicationLauncherClusterApplicationEP : NSObject
 @property (strong, nonatomic) MTRApplicationLauncherClusterApplication * _Nonnull application;
 @property (strong, nonatomic) NSNumber * _Nullable endpoint;
 - (instancetype)init;
+
 @end
 
 @interface MTRApplicationBasicClusterApplicationBasicApplication : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull catalogVendorId;
 @property (strong, nonatomic) NSString * _Nonnull applicationId;
 - (instancetype)init;
+
 @end
 
 @interface MTRTestClusterClusterSimpleStruct : NSObject
@@ -691,6 +744,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull g;
 @property (strong, nonatomic) NSNumber * _Nonnull h;
 - (instancetype)init;
+
 @end
 
 @interface MTRTestClusterClusterTestFabricScoped : NSObject
@@ -703,6 +757,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSArray * _Nonnull fabricSensitiveInt8uList;
 @property (strong, nonatomic) NSNumber * _Nonnull fabricIndex;
 - (instancetype)init;
+
 @end
 
 @interface MTRTestClusterClusterNullablesAndOptionalsStruct : NSObject
@@ -719,6 +774,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSArray * _Nullable optionalList;
 @property (strong, nonatomic) NSArray * _Nullable nullableOptionalList;
 - (instancetype)init;
+
 @end
 
 @interface MTRTestClusterClusterNestedStruct : NSObject
@@ -726,6 +782,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSNumber * _Nonnull b;
 @property (strong, nonatomic) MTRTestClusterClusterSimpleStruct * _Nonnull c;
 - (instancetype)init;
+
 @end
 
 @interface MTRTestClusterClusterNestedStructList : NSObject
@@ -737,17 +794,20 @@ NS_ASSUME_NONNULL_BEGIN
 @property (strong, nonatomic) NSArray * _Nonnull f;
 @property (strong, nonatomic) NSArray * _Nonnull g;
 - (instancetype)init;
+
 @end
 
 @interface MTRTestClusterClusterDoubleNestedStructList : NSObject
 @property (strong, nonatomic) NSArray * _Nonnull a;
 - (instancetype)init;
+
 @end
 
 @interface MTRTestClusterClusterTestListStructOctet : NSObject
 @property (strong, nonatomic) NSNumber * _Nonnull member1;
 @property (strong, nonatomic) NSData * _Nonnull member2;
 - (instancetype)init;
+
 @end
 
 @interface MTRTestClusterClusterTestEventEvent : NSObject
diff --git a/src/darwin/Framework/CHIPTests/MTRTestKeys.h b/src/darwin/Framework/CHIPTests/MTRTestKeys.h
index c82da202e5bd54..01bbb78397710b 100644
--- a/src/darwin/Framework/CHIPTests/MTRTestKeys.h
+++ b/src/darwin/Framework/CHIPTests/MTRTestKeys.h
@@ -24,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly, nonatomic, strong) NSData * ipk;
 
 - (instancetype)init;
+
 @end
 
 NS_ASSUME_NONNULL_END