diff --git a/src/app/zap-templates/templates/app/cluster-enums.zapt b/src/app/zap-templates/templates/app/cluster-enums.zapt
index fa547a3bfad8e8..2a6ac5a1f3ed35 100644
--- a/src/app/zap-templates/templates/app/cluster-enums.zapt
+++ b/src/app/zap-templates/templates/app/cluster-enums.zapt
@@ -24,13 +24,14 @@ enum class {{asType label}} : {{asUnderlyingZclType name}} {
 {{#zcl_enum_items}}
 k{{asUpperCamelCase label}} = {{asHex value 2}},
 {{/zcl_enum_items}}
+// kUnknownEnumValue = {{first_unused_enum_value mode="first_unused"}},
 };
 {{#if (isWeaklyTypedEnum label)}}
 #else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using {{asType label}} = EmberAf{{asType label}};
+static {{asType label}} __attribute__((unused)) k{{asType label}}kUnknownEnumValue = static_cast<{{asType label}}>({{first_unused_enum_value mode="first_unused"}});
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 {{/if}}
-static {{asType label}} __attribute__((unused)) k{{asType label}}FirstUnusedEnumVal = static_cast<{{asType label}}>({{first_unused_enum_value mode="first_unused"}});
 {{/zcl_enums}}
 {{#zcl_bitmaps}}
 
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 acb56a0bd95e43..dc7db3550309f8 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
@@ -47,12 +47,13 @@ enum class IdentifyEffectIdentifier : uint8_t
     kChannelChange = 0x0B,
     kFinishEffect  = 0xFE,
     kStopEffect    = 0xFF,
+    // kUnknownEnumValue = 3,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using IdentifyEffectIdentifier        = EmberAfIdentifyEffectIdentifier;
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static IdentifyEffectIdentifier __attribute__((unused)) kIdentifyEffectIdentifierFirstUnusedEnumVal =
+using IdentifyEffectIdentifier = EmberAfIdentifyEffectIdentifier;
+static IdentifyEffectIdentifier __attribute__((unused)) kIdentifyEffectIdentifierkUnknownEnumValue =
     static_cast<IdentifyEffectIdentifier>(3);
+#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -61,12 +62,13 @@ static IdentifyEffectIdentifier __attribute__((unused)) kIdentifyEffectIdentifie
 enum class IdentifyEffectVariant : uint8_t
 {
     kDefault = 0x00,
+    // kUnknownEnumValue = 1,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using IdentifyEffectVariant           = EmberAfIdentifyEffectVariant;
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static IdentifyEffectVariant __attribute__((unused)) kIdentifyEffectVariantFirstUnusedEnumVal =
+using IdentifyEffectVariant = EmberAfIdentifyEffectVariant;
+static IdentifyEffectVariant __attribute__((unused)) kIdentifyEffectVariantkUnknownEnumValue =
     static_cast<IdentifyEffectVariant>(1);
+#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -80,11 +82,12 @@ enum class IdentifyIdentifyType : uint8_t
     kAudibleBeep  = 0x03,
     kDisplay      = 0x04,
     kActuator     = 0x05,
+    // kUnknownEnumValue = 6,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using IdentifyIdentifyType            = EmberAfIdentifyIdentifyType;
+using IdentifyIdentifyType                                                                 = EmberAfIdentifyIdentifyType;
+static IdentifyIdentifyType __attribute__((unused)) kIdentifyIdentifyTypekUnknownEnumValue = static_cast<IdentifyIdentifyType>(6);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static IdentifyIdentifyType __attribute__((unused)) kIdentifyIdentifyTypeFirstUnusedEnumVal = static_cast<IdentifyIdentifyType>(6);
 } // namespace Identify
 
 namespace Groups {
@@ -116,12 +119,13 @@ enum class OnOffDelayedAllOffEffectVariant : uint8_t
     kFadeToOffIn0p8Seconds                                = 0x00,
     kNoFade                                               = 0x01,
     k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 0x02,
+    // kUnknownEnumValue = 3,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using OnOffDelayedAllOffEffectVariant = EmberAfOnOffDelayedAllOffEffectVariant;
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static OnOffDelayedAllOffEffectVariant __attribute__((unused)) kOnOffDelayedAllOffEffectVariantFirstUnusedEnumVal =
+using OnOffDelayedAllOffEffectVariant                                                      = EmberAfOnOffDelayedAllOffEffectVariant;
+static OnOffDelayedAllOffEffectVariant __attribute__((unused)) kOnOffDelayedAllOffEffectVariantkUnknownEnumValue =
     static_cast<OnOffDelayedAllOffEffectVariant>(3);
+#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -130,12 +134,13 @@ static OnOffDelayedAllOffEffectVariant __attribute__((unused)) kOnOffDelayedAllO
 enum class OnOffDyingLightEffectVariant : uint8_t
 {
     k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0x00,
+    // kUnknownEnumValue = 1,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using OnOffDyingLightEffectVariant    = EmberAfOnOffDyingLightEffectVariant;
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static OnOffDyingLightEffectVariant __attribute__((unused)) kOnOffDyingLightEffectVariantFirstUnusedEnumVal =
+using OnOffDyingLightEffectVariant = EmberAfOnOffDyingLightEffectVariant;
+static OnOffDyingLightEffectVariant __attribute__((unused)) kOnOffDyingLightEffectVariantkUnknownEnumValue =
     static_cast<OnOffDyingLightEffectVariant>(1);
+#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -145,12 +150,13 @@ enum class OnOffEffectIdentifier : uint8_t
 {
     kDelayedAllOff = 0x00,
     kDyingLight    = 0x01,
+    // kUnknownEnumValue = 2,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using OnOffEffectIdentifier           = EmberAfOnOffEffectIdentifier;
-#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static OnOffEffectIdentifier __attribute__((unused)) kOnOffEffectIdentifierFirstUnusedEnumVal =
+using OnOffEffectIdentifier = EmberAfOnOffEffectIdentifier;
+static OnOffEffectIdentifier __attribute__((unused)) kOnOffEffectIdentifierkUnknownEnumValue =
     static_cast<OnOffEffectIdentifier>(2);
+#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
 // Enum for OnOffStartUpOnOff
 enum class OnOffStartUpOnOff : uint8_t
@@ -158,8 +164,8 @@ enum class OnOffStartUpOnOff : uint8_t
     kOff                 = 0x00,
     kOn                  = 0x01,
     kTogglePreviousOnOff = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static OnOffStartUpOnOff __attribute__((unused)) kOnOffStartUpOnOffFirstUnusedEnumVal = static_cast<OnOffStartUpOnOff>(3);
 
 // Bitmap for OnOffControl
 enum class OnOffControl : uint8_t
@@ -193,11 +199,12 @@ enum class MoveMode : uint8_t
 {
     kUp   = 0x00,
     kDown = 0x01,
+    // kUnknownEnumValue = 2,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using MoveMode                        = EmberAfMoveMode;
+using MoveMode                                                                         = EmberAfMoveMode;
+static MoveMode __attribute__((unused)) kMoveModekUnknownEnumValue                     = static_cast<MoveMode>(2);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static MoveMode __attribute__((unused)) kMoveModeFirstUnusedEnumVal = static_cast<MoveMode>(2);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -207,11 +214,12 @@ enum class StepMode : uint8_t
 {
     kUp   = 0x00,
     kDown = 0x01,
+    // kUnknownEnumValue = 2,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using StepMode                        = EmberAfStepMode;
+using StepMode                                                                         = EmberAfStepMode;
+static StepMode __attribute__((unused)) kStepModekUnknownEnumValue                     = static_cast<StepMode>(2);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static StepMode __attribute__((unused)) kStepModeFirstUnusedEnumVal = static_cast<StepMode>(2);
 
 // Bitmap for LevelControlFeature
 enum class LevelControlFeature : uint32_t
@@ -254,8 +262,8 @@ enum class ApplianceStatus : uint8_t
     kSuperfreezing            = 0x0D,
     kSupercooling             = 0x0E,
     kSuperheating             = 0x0F,
+    // kUnknownEnumValue = 0,
 };
-static ApplianceStatus __attribute__((unused)) kApplianceStatusFirstUnusedEnumVal = static_cast<ApplianceStatus>(0);
 
 // Enum for CommandIdentification
 enum class CommandIdentification : uint8_t
@@ -271,9 +279,8 @@ enum class CommandIdentification : uint8_t
     kEnableGas            = 0x09,
     kEnableEnergyControl  = 0x0A,
     kDisableEnergyControl = 0x0B,
+    // kUnknownEnumValue = 0,
 };
-static CommandIdentification __attribute__((unused)) kCommandIdentificationFirstUnusedEnumVal =
-    static_cast<CommandIdentification>(0);
 
 // Enum for WarningEvent
 enum class WarningEvent : uint8_t
@@ -283,8 +290,8 @@ enum class WarningEvent : uint8_t
     kWarning3OverallPowerBackBelowTheAvailablePowerLevel                               = 0x02,
     kWarning4OverallPowerBackBelowThePowerThresholdLevel                               = 0x03,
     kWarning5OverallPowerWillBePotentiallyAboveAvailablePowerLevelIfTheApplianceStarts = 0x04,
+    // kUnknownEnumValue = 5,
 };
-static WarningEvent __attribute__((unused)) kWarningEventFirstUnusedEnumVal = static_cast<WarningEvent>(5);
 
 // Bitmap for RemoteEnableFlagsAndDeviceStatus2
 enum class RemoteEnableFlagsAndDeviceStatus2 : uint8_t
@@ -311,8 +318,8 @@ enum class AuthMode : uint8_t
     kPase  = 0x01,
     kCase  = 0x02,
     kGroup = 0x03,
+    // kUnknownEnumValue = 0,
 };
-static AuthMode __attribute__((unused)) kAuthModeFirstUnusedEnumVal = static_cast<AuthMode>(0);
 
 // Enum for ChangeTypeEnum
 enum class ChangeTypeEnum : uint8_t
@@ -320,8 +327,8 @@ enum class ChangeTypeEnum : uint8_t
     kChanged = 0x00,
     kAdded   = 0x01,
     kRemoved = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static ChangeTypeEnum __attribute__((unused)) kChangeTypeEnumFirstUnusedEnumVal = static_cast<ChangeTypeEnum>(3);
 
 // Enum for Privilege
 enum class Privilege : uint8_t
@@ -331,8 +338,8 @@ enum class Privilege : uint8_t
     kOperate    = 0x03,
     kManage     = 0x04,
     kAdminister = 0x05,
+    // kUnknownEnumValue = 0,
 };
-static Privilege __attribute__((unused)) kPrivilegeFirstUnusedEnumVal = static_cast<Privilege>(0);
 } // namespace AccessControl
 
 namespace PollControl {
@@ -345,8 +352,8 @@ enum class ActionErrorEnum : uint8_t
 {
     kUnknown     = 0x00,
     kInterrupted = 0x01,
+    // kUnknownEnumValue = 2,
 };
-static ActionErrorEnum __attribute__((unused)) kActionErrorEnumFirstUnusedEnumVal = static_cast<ActionErrorEnum>(2);
 
 // Enum for ActionStateEnum
 enum class ActionStateEnum : uint8_t
@@ -355,8 +362,8 @@ enum class ActionStateEnum : uint8_t
     kActive   = 0x01,
     kPaused   = 0x02,
     kDisabled = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static ActionStateEnum __attribute__((unused)) kActionStateEnumFirstUnusedEnumVal = static_cast<ActionStateEnum>(4);
 
 // Enum for ActionTypeEnum
 enum class ActionTypeEnum : uint8_t
@@ -368,8 +375,8 @@ enum class ActionTypeEnum : uint8_t
     kException    = 0x04,
     kNotification = 0x05,
     kAlarm        = 0x06,
+    // kUnknownEnumValue = 7,
 };
-static ActionTypeEnum __attribute__((unused)) kActionTypeEnumFirstUnusedEnumVal = static_cast<ActionTypeEnum>(7);
 
 // Enum for EndpointListTypeEnum
 enum class EndpointListTypeEnum : uint8_t
@@ -377,8 +384,8 @@ enum class EndpointListTypeEnum : uint8_t
     kOther = 0x00,
     kRoom  = 0x01,
     kZone  = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static EndpointListTypeEnum __attribute__((unused)) kEndpointListTypeEnumFirstUnusedEnumVal = static_cast<EndpointListTypeEnum>(3);
 
 // Bitmap for CommandBits
 enum class CommandBits : uint16_t
@@ -409,8 +416,8 @@ enum class OTAApplyUpdateAction : uint8_t
     kProceed         = 0x00,
     kAwaitNextAction = 0x01,
     kDiscontinue     = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static OTAApplyUpdateAction __attribute__((unused)) kOTAApplyUpdateActionFirstUnusedEnumVal = static_cast<OTAApplyUpdateAction>(3);
 
 // Enum for OTADownloadProtocol
 enum class OTADownloadProtocol : uint8_t
@@ -419,8 +426,8 @@ enum class OTADownloadProtocol : uint8_t
     kBDXAsynchronous = 0x01,
     kHttps           = 0x02,
     kVendorSpecific  = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static OTADownloadProtocol __attribute__((unused)) kOTADownloadProtocolFirstUnusedEnumVal = static_cast<OTADownloadProtocol>(4);
 
 // Enum for OTAQueryStatus
 enum class OTAQueryStatus : uint8_t
@@ -429,8 +436,8 @@ enum class OTAQueryStatus : uint8_t
     kBusy                         = 0x01,
     kNotAvailable                 = 0x02,
     kDownloadProtocolNotSupported = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static OTAQueryStatus __attribute__((unused)) kOTAQueryStatusFirstUnusedEnumVal = static_cast<OTAQueryStatus>(4);
 } // namespace OtaSoftwareUpdateProvider
 
 namespace OtaSoftwareUpdateRequestor {
@@ -441,9 +448,8 @@ enum class OTAAnnouncementReason : uint8_t
     kSimpleAnnouncement    = 0x00,
     kUpdateAvailable       = 0x01,
     kUrgentUpdateAvailable = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static OTAAnnouncementReason __attribute__((unused)) kOTAAnnouncementReasonFirstUnusedEnumVal =
-    static_cast<OTAAnnouncementReason>(3);
 
 // Enum for OTAChangeReasonEnum
 enum class OTAChangeReasonEnum : uint8_t
@@ -453,8 +459,8 @@ enum class OTAChangeReasonEnum : uint8_t
     kFailure         = 0x02,
     kTimeOut         = 0x03,
     kDelayByProvider = 0x04,
+    // kUnknownEnumValue = 5,
 };
-static OTAChangeReasonEnum __attribute__((unused)) kOTAChangeReasonEnumFirstUnusedEnumVal = static_cast<OTAChangeReasonEnum>(5);
 
 // Enum for OTAUpdateStateEnum
 enum class OTAUpdateStateEnum : uint8_t
@@ -468,8 +474,8 @@ enum class OTAUpdateStateEnum : uint8_t
     kDelayedOnApply       = 0x06,
     kRollingBack          = 0x07,
     kDelayedOnUserConsent = 0x08,
+    // kUnknownEnumValue = 9,
 };
-static OTAUpdateStateEnum __attribute__((unused)) kOTAUpdateStateEnumFirstUnusedEnumVal = static_cast<OTAUpdateStateEnum>(9);
 } // namespace OtaSoftwareUpdateRequestor
 
 namespace LocalizationConfiguration {
@@ -492,16 +498,16 @@ enum class CalendarType : uint8_t
     kKorean    = 0x09,
     kPersian   = 0x0A,
     kTaiwanese = 0x0B,
+    // kUnknownEnumValue = 12,
 };
-static CalendarType __attribute__((unused)) kCalendarTypeFirstUnusedEnumVal = static_cast<CalendarType>(12);
 
 // Enum for HourFormat
 enum class HourFormat : uint8_t
 {
     k12hr = 0x00,
     k24hr = 0x01,
+    // kUnknownEnumValue = 2,
 };
-static HourFormat __attribute__((unused)) kHourFormatFirstUnusedEnumVal = static_cast<HourFormat>(2);
 } // namespace TimeFormatLocalization
 
 namespace UnitLocalization {
@@ -512,8 +518,8 @@ enum class TempUnit : uint8_t
     kFahrenheit = 0x00,
     kCelsius    = 0x01,
     kKelvin     = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static TempUnit __attribute__((unused)) kTempUnitFirstUnusedEnumVal = static_cast<TempUnit>(3);
 
 // Bitmap for UnitLocalizationFeature
 enum class UnitLocalizationFeature : uint32_t
@@ -541,8 +547,8 @@ enum class BatChargeFault : uint8_t
     kChargerOverVoltage  = 0x08,
     kChargerUnderVoltage = 0x09,
     kSafetyTimeout       = 0x0A,
+    // kUnknownEnumValue = 11,
 };
-static BatChargeFault __attribute__((unused)) kBatChargeFaultFirstUnusedEnumVal = static_cast<BatChargeFault>(11);
 
 // Enum for BatChargeLevel
 enum class BatChargeLevel : uint8_t
@@ -550,8 +556,8 @@ enum class BatChargeLevel : uint8_t
     kOk       = 0x00,
     kWarning  = 0x01,
     kCritical = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static BatChargeLevel __attribute__((unused)) kBatChargeLevelFirstUnusedEnumVal = static_cast<BatChargeLevel>(3);
 
 // Enum for BatChargeState
 enum class BatChargeState : uint8_t
@@ -560,8 +566,8 @@ enum class BatChargeState : uint8_t
     kIsCharging     = 0x01,
     kIsAtFullCharge = 0x02,
     kIsNotCharging  = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static BatChargeState __attribute__((unused)) kBatChargeStateFirstUnusedEnumVal = static_cast<BatChargeState>(4);
 
 // Enum for BatFault
 enum class BatFault : uint8_t
@@ -569,8 +575,8 @@ enum class BatFault : uint8_t
     kUnspecfied = 0x00,
     kOverTemp   = 0x01,
     kUnderTemp  = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static BatFault __attribute__((unused)) kBatFaultFirstUnusedEnumVal = static_cast<BatFault>(3);
 
 // Enum for BatReplaceability
 enum class BatReplaceability : uint8_t
@@ -579,8 +585,8 @@ enum class BatReplaceability : uint8_t
     kNotReplaceable     = 0x01,
     kUserReplaceable    = 0x02,
     kFactoryReplaceable = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static BatReplaceability __attribute__((unused)) kBatReplaceabilityFirstUnusedEnumVal = static_cast<BatReplaceability>(4);
 
 // Enum for PowerSourceStatus
 enum class PowerSourceStatus : uint8_t
@@ -589,16 +595,16 @@ enum class PowerSourceStatus : uint8_t
     kActive      = 0x01,
     kStandby     = 0x02,
     kUnavailable = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static PowerSourceStatus __attribute__((unused)) kPowerSourceStatusFirstUnusedEnumVal = static_cast<PowerSourceStatus>(4);
 
 // Enum for WiredCurrentType
 enum class WiredCurrentType : uint8_t
 {
     kAc = 0x00,
     kDc = 0x01,
+    // kUnknownEnumValue = 2,
 };
-static WiredCurrentType __attribute__((unused)) kWiredCurrentTypeFirstUnusedEnumVal = static_cast<WiredCurrentType>(2);
 
 // Enum for WiredFault
 enum class WiredFault : uint8_t
@@ -606,8 +612,8 @@ enum class WiredFault : uint8_t
     kUnspecfied   = 0x00,
     kOverVoltage  = 0x01,
     kUnderVoltage = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static WiredFault __attribute__((unused)) kWiredFaultFirstUnusedEnumVal = static_cast<WiredFault>(3);
 
 // Bitmap for PowerSourceFeature
 enum class PowerSourceFeature : uint32_t
@@ -629,8 +635,8 @@ enum class CommissioningError : uint8_t
     kInvalidAuthentication = 0x02,
     kNoFailSafe            = 0x03,
     kBusyWithOtherAdmin    = 0x04,
+    // kUnknownEnumValue = 5,
 };
-static CommissioningError __attribute__((unused)) kCommissioningErrorFirstUnusedEnumVal = static_cast<CommissioningError>(5);
 
 // Enum for RegulatoryLocationType
 enum class RegulatoryLocationType : uint8_t
@@ -638,9 +644,8 @@ enum class RegulatoryLocationType : uint8_t
     kIndoor        = 0x00,
     kOutdoor       = 0x01,
     kIndoorOutdoor = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static RegulatoryLocationType __attribute__((unused)) kRegulatoryLocationTypeFirstUnusedEnumVal =
-    static_cast<RegulatoryLocationType>(3);
 } // namespace GeneralCommissioning
 
 namespace NetworkCommissioning {
@@ -661,9 +666,8 @@ enum class NetworkCommissioningStatus : uint8_t
     kIPV6Failed             = 0x0A,
     kIPBindFailed           = 0x0B,
     kUnknownError           = 0x0C,
+    // kUnknownEnumValue = 13,
 };
-static NetworkCommissioningStatus __attribute__((unused)) kNetworkCommissioningStatusFirstUnusedEnumVal =
-    static_cast<NetworkCommissioningStatus>(13);
 
 // Enum for WiFiBand
 enum class WiFiBand : uint8_t
@@ -673,8 +677,8 @@ enum class WiFiBand : uint8_t
     k5g   = 0x02,
     k6g   = 0x03,
     k60g  = 0x04,
+    // kUnknownEnumValue = 5,
 };
-static WiFiBand __attribute__((unused)) kWiFiBandFirstUnusedEnumVal = static_cast<WiFiBand>(5);
 
 // Bitmap for NetworkCommissioningFeature
 enum class NetworkCommissioningFeature : uint32_t
@@ -703,8 +707,8 @@ enum class LogsIntent : uint8_t
     kEndUserSupport = 0x00,
     kNetworkDiag    = 0x01,
     kCrashLogs      = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static LogsIntent __attribute__((unused)) kLogsIntentFirstUnusedEnumVal = static_cast<LogsIntent>(3);
 
 // Enum for LogsStatus
 enum class LogsStatus : uint8_t
@@ -714,16 +718,16 @@ enum class LogsStatus : uint8_t
     kNoLogs    = 0x02,
     kBusy      = 0x03,
     kDenied    = 0x04,
+    // kUnknownEnumValue = 5,
 };
-static LogsStatus __attribute__((unused)) kLogsStatusFirstUnusedEnumVal = static_cast<LogsStatus>(5);
 
 // Enum for LogsTransferProtocol
 enum class LogsTransferProtocol : uint8_t
 {
     kResponsePayload = 0x00,
     kBdx             = 0x01,
+    // kUnknownEnumValue = 2,
 };
-static LogsTransferProtocol __attribute__((unused)) kLogsTransferProtocolFirstUnusedEnumVal = static_cast<LogsTransferProtocol>(2);
 } // namespace DiagnosticLogs
 
 namespace GeneralDiagnostics {
@@ -738,8 +742,8 @@ enum class BootReasonType : uint8_t
     kHardwareWatchdogReset   = 0x04,
     kSoftwareUpdateCompleted = 0x05,
     kSoftwareReset           = 0x06,
+    // kUnknownEnumValue = 7,
 };
-static BootReasonType __attribute__((unused)) kBootReasonTypeFirstUnusedEnumVal = static_cast<BootReasonType>(7);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -758,11 +762,12 @@ enum class HardwareFaultType : uint8_t
     kUserInterfaceFault     = 0x08,
     kNonVolatileMemoryError = 0x09,
     kTamperDetected         = 0x0A,
+    // kUnknownEnumValue = 11,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using HardwareFaultType               = EmberAfHardwareFaultType;
+using HardwareFaultType                                                                = EmberAfHardwareFaultType;
+static HardwareFaultType __attribute__((unused)) kHardwareFaultTypekUnknownEnumValue   = static_cast<HardwareFaultType>(11);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static HardwareFaultType __attribute__((unused)) kHardwareFaultTypeFirstUnusedEnumVal = static_cast<HardwareFaultType>(11);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -775,11 +780,12 @@ enum class InterfaceType : uint8_t
     kEthernet    = 0x02,
     kCellular    = 0x03,
     kThread      = 0x04,
+    // kUnknownEnumValue = 5,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using InterfaceType                   = EmberAfInterfaceType;
+using InterfaceType                                                                    = EmberAfInterfaceType;
+static InterfaceType __attribute__((unused)) kInterfaceTypekUnknownEnumValue           = static_cast<InterfaceType>(5);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static InterfaceType __attribute__((unused)) kInterfaceTypeFirstUnusedEnumVal = static_cast<InterfaceType>(5);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -791,11 +797,12 @@ enum class NetworkFaultType : uint8_t
     kHardwareFailure  = 0x01,
     kNetworkJammed    = 0x02,
     kConnectionFailed = 0x03,
+    // kUnknownEnumValue = 4,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using NetworkFaultType                = EmberAfNetworkFaultType;
+using NetworkFaultType                                                                 = EmberAfNetworkFaultType;
+static NetworkFaultType __attribute__((unused)) kNetworkFaultTypekUnknownEnumValue     = static_cast<NetworkFaultType>(4);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static NetworkFaultType __attribute__((unused)) kNetworkFaultTypeFirstUnusedEnumVal = static_cast<NetworkFaultType>(4);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -810,11 +817,12 @@ enum class RadioFaultType : uint8_t
     kNFCFault      = 0x04,
     kBLEFault      = 0x05,
     kEthernetFault = 0x06,
+    // kUnknownEnumValue = 7,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using RadioFaultType                  = EmberAfRadioFaultType;
+using RadioFaultType                                                                   = EmberAfRadioFaultType;
+static RadioFaultType __attribute__((unused)) kRadioFaultTypekUnknownEnumValue         = static_cast<RadioFaultType>(7);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static RadioFaultType __attribute__((unused)) kRadioFaultTypeFirstUnusedEnumVal = static_cast<RadioFaultType>(7);
 } // namespace GeneralDiagnostics
 
 namespace SoftwareDiagnostics {
@@ -835,8 +843,8 @@ enum class NetworkFault : uint8_t
     kLinkDown        = 0x01,
     kHardwareFailure = 0x02,
     kNetworkJammed   = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static NetworkFault __attribute__((unused)) kNetworkFaultFirstUnusedEnumVal = static_cast<NetworkFault>(4);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -851,20 +859,20 @@ enum class RoutingRole : uint8_t
     kReed            = 0x04,
     kRouter          = 0x05,
     kLeader          = 0x06,
+    // kUnknownEnumValue = 7,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using RoutingRole                     = EmberAfRoutingRole;
+using RoutingRole                                                                      = EmberAfRoutingRole;
+static RoutingRole __attribute__((unused)) kRoutingRolekUnknownEnumValue               = static_cast<RoutingRole>(7);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static RoutingRole __attribute__((unused)) kRoutingRoleFirstUnusedEnumVal = static_cast<RoutingRole>(7);
 
 // Enum for ThreadConnectionStatus
 enum class ThreadConnectionStatus : uint8_t
 {
     kConnected    = 0x00,
     kNotConnected = 0x01,
+    // kUnknownEnumValue = 2,
 };
-static ThreadConnectionStatus __attribute__((unused)) kThreadConnectionStatusFirstUnusedEnumVal =
-    static_cast<ThreadConnectionStatus>(2);
 
 // Bitmap for ThreadNetworkDiagnosticsFeature
 enum class ThreadNetworkDiagnosticsFeature : uint32_t
@@ -885,9 +893,8 @@ enum class AssociationFailureCause : uint8_t
     kAssociationFailed    = 0x01,
     kAuthenticationFailed = 0x02,
     kSsidNotFound         = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static AssociationFailureCause __attribute__((unused)) kAssociationFailureCauseFirstUnusedEnumVal =
-    static_cast<AssociationFailureCause>(4);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -901,19 +908,20 @@ enum class SecurityType : uint8_t
     kWpa         = 0x03,
     kWpa2        = 0x04,
     kWpa3        = 0x05,
+    // kUnknownEnumValue = 6,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using SecurityType                    = EmberAfSecurityType;
+using SecurityType                                                                     = EmberAfSecurityType;
+static SecurityType __attribute__((unused)) kSecurityTypekUnknownEnumValue             = static_cast<SecurityType>(6);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static SecurityType __attribute__((unused)) kSecurityTypeFirstUnusedEnumVal = static_cast<SecurityType>(6);
 
 // Enum for WiFiConnectionStatus
 enum class WiFiConnectionStatus : uint8_t
 {
     kConnected    = 0x00,
     kNotConnected = 0x01,
+    // kUnknownEnumValue = 2,
 };
-static WiFiConnectionStatus __attribute__((unused)) kWiFiConnectionStatusFirstUnusedEnumVal = static_cast<WiFiConnectionStatus>(2);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -927,11 +935,12 @@ enum class WiFiVersionType : uint8_t
     k80211n  = 0x03,
     k80211ac = 0x04,
     k80211ax = 0x05,
+    // kUnknownEnumValue = 6,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using WiFiVersionType                 = EmberAfWiFiVersionType;
+using WiFiVersionType                                                                  = EmberAfWiFiVersionType;
+static WiFiVersionType __attribute__((unused)) kWiFiVersionTypekUnknownEnumValue       = static_cast<WiFiVersionType>(6);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static WiFiVersionType __attribute__((unused)) kWiFiVersionTypeFirstUnusedEnumVal = static_cast<WiFiVersionType>(6);
 } // namespace WiFiNetworkDiagnostics
 
 namespace EthernetNetworkDiagnostics {
@@ -952,11 +961,12 @@ enum class PHYRateType : uint8_t
     k100g  = 0x07,
     k200g  = 0x08,
     k400g  = 0x09,
+    // kUnknownEnumValue = 10,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using PHYRateType                     = EmberAfPHYRateType;
+using PHYRateType                                                                      = EmberAfPHYRateType;
+static PHYRateType __attribute__((unused)) kPHYRateTypekUnknownEnumValue               = static_cast<PHYRateType>(10);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static PHYRateType __attribute__((unused)) kPHYRateTypeFirstUnusedEnumVal = static_cast<PHYRateType>(10);
 } // namespace EthernetNetworkDiagnostics
 
 namespace TimeSynchronization {
@@ -976,9 +986,8 @@ enum class CommissioningWindowStatus : uint8_t
     kWindowNotOpen      = 0x00,
     kEnhancedWindowOpen = 0x01,
     kBasicWindowOpen    = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static CommissioningWindowStatus __attribute__((unused)) kCommissioningWindowStatusFirstUnusedEnumVal =
-    static_cast<CommissioningWindowStatus>(3);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -989,11 +998,12 @@ enum class StatusCode : uint8_t
     kBusy               = 0x01,
     kPAKEParameterError = 0x02,
     kWindowNotOpen      = 0x03,
+    // kUnknownEnumValue = 0,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using StatusCode                      = EmberAfStatusCode;
+using StatusCode                                                                       = EmberAfStatusCode;
+static StatusCode __attribute__((unused)) kStatusCodekUnknownEnumValue                 = static_cast<StatusCode>(0);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static StatusCode __attribute__((unused)) kStatusCodeFirstUnusedEnumVal = static_cast<StatusCode>(0);
 } // namespace AdministratorCommissioning
 
 namespace OperationalCredentials {
@@ -1012,9 +1022,8 @@ enum class OperationalCertStatus : uint8_t
     kFabricConflict        = 0x09,
     kLabelConflict         = 0x0A,
     kInvalidFabricIndex    = 0x0B,
+    // kUnknownEnumValue = 7,
 };
-static OperationalCertStatus __attribute__((unused)) kOperationalCertStatusFirstUnusedEnumVal =
-    static_cast<OperationalCertStatus>(7);
 } // namespace OperationalCredentials
 
 namespace GroupKeyManagement {
@@ -1024,9 +1033,8 @@ enum class GroupKeySecurityPolicy : uint8_t
 {
     kTrustFirst   = 0x00,
     kCacheAndSync = 0x01,
+    // kUnknownEnumValue = 2,
 };
-static GroupKeySecurityPolicy __attribute__((unused)) kGroupKeySecurityPolicyFirstUnusedEnumVal =
-    static_cast<GroupKeySecurityPolicy>(2);
 } // namespace GroupKeyManagement
 
 namespace FixedLabel {
@@ -1072,8 +1080,8 @@ enum class DlAlarmCode : uint8_t
     kDoorForcedOpen          = 0x06,
     kDoorAjar                = 0x07,
     kForcedUser              = 0x08,
+    // kUnknownEnumValue = 2,
 };
-static DlAlarmCode __attribute__((unused)) kDlAlarmCodeFirstUnusedEnumVal = static_cast<DlAlarmCode>(2);
 
 // Enum for DlCredentialRule
 enum class DlCredentialRule : uint8_t
@@ -1081,8 +1089,8 @@ enum class DlCredentialRule : uint8_t
     kSingle = 0x00,
     kDouble = 0x01,
     kTri    = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static DlCredentialRule __attribute__((unused)) kDlCredentialRuleFirstUnusedEnumVal = static_cast<DlCredentialRule>(3);
 
 // Enum for DlCredentialType
 enum class DlCredentialType : uint8_t
@@ -1093,8 +1101,8 @@ enum class DlCredentialType : uint8_t
     kFingerprint    = 0x03,
     kFingerVein     = 0x04,
     kFace           = 0x05,
+    // kUnknownEnumValue = 6,
 };
-static DlCredentialType __attribute__((unused)) kDlCredentialTypeFirstUnusedEnumVal = static_cast<DlCredentialType>(6);
 
 // Enum for DlDataOperationType
 enum class DlDataOperationType : uint8_t
@@ -1102,8 +1110,8 @@ enum class DlDataOperationType : uint8_t
     kAdd    = 0x00,
     kClear  = 0x01,
     kModify = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static DlDataOperationType __attribute__((unused)) kDlDataOperationTypeFirstUnusedEnumVal = static_cast<DlDataOperationType>(3);
 
 // Enum for DlDoorState
 enum class DlDoorState : uint8_t
@@ -1114,8 +1122,8 @@ enum class DlDoorState : uint8_t
     kDoorForcedOpen       = 0x03,
     kDoorUnspecifiedError = 0x04,
     kDoorAjar             = 0x05,
+    // kUnknownEnumValue = 6,
 };
-static DlDoorState __attribute__((unused)) kDlDoorStateFirstUnusedEnumVal = static_cast<DlDoorState>(6);
 
 // Enum for DlLockDataType
 enum class DlLockDataType : uint8_t
@@ -1129,8 +1137,8 @@ enum class DlLockDataType : uint8_t
     kPin             = 0x06,
     kRfid            = 0x07,
     kFingerprint     = 0x08,
+    // kUnknownEnumValue = 9,
 };
-static DlLockDataType __attribute__((unused)) kDlLockDataTypeFirstUnusedEnumVal = static_cast<DlLockDataType>(9);
 
 // Enum for DlLockOperationType
 enum class DlLockOperationType : uint8_t
@@ -1139,8 +1147,8 @@ enum class DlLockOperationType : uint8_t
     kUnlock             = 0x01,
     kNonAccessUserEvent = 0x02,
     kForcedUserEvent    = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static DlLockOperationType __attribute__((unused)) kDlLockOperationTypeFirstUnusedEnumVal = static_cast<DlLockOperationType>(4);
 
 // Enum for DlLockState
 enum class DlLockState : uint8_t
@@ -1148,8 +1156,8 @@ enum class DlLockState : uint8_t
     kNotFullyLocked = 0x00,
     kLocked         = 0x01,
     kUnlocked       = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static DlLockState __attribute__((unused)) kDlLockStateFirstUnusedEnumVal = static_cast<DlLockState>(3);
 
 // Enum for DlLockType
 enum class DlLockType : uint8_t
@@ -1165,8 +1173,8 @@ enum class DlLockType : uint8_t
     kInterconnectedLock = 0x08,
     kDeadLatch          = 0x09,
     kDoorFurniture      = 0x0A,
+    // kUnknownEnumValue = 11,
 };
-static DlLockType __attribute__((unused)) kDlLockTypeFirstUnusedEnumVal = static_cast<DlLockType>(11);
 
 // Enum for DlOperatingMode
 enum class DlOperatingMode : uint8_t
@@ -1176,8 +1184,8 @@ enum class DlOperatingMode : uint8_t
     kPrivacy            = 0x02,
     kNoRemoteLockUnlock = 0x03,
     kPassage            = 0x04,
+    // kUnknownEnumValue = 5,
 };
-static DlOperatingMode __attribute__((unused)) kDlOperatingModeFirstUnusedEnumVal = static_cast<DlOperatingMode>(5);
 
 // Enum for DlOperationError
 enum class DlOperationError : uint8_t
@@ -1187,8 +1195,8 @@ enum class DlOperationError : uint8_t
     kDisabledUserDenied  = 0x02,
     kRestricted          = 0x03,
     kInsufficientBattery = 0x04,
+    // kUnknownEnumValue = 5,
 };
-static DlOperationError __attribute__((unused)) kDlOperationErrorFirstUnusedEnumVal = static_cast<DlOperationError>(5);
 
 // Enum for DlOperationSource
 enum class DlOperationSource : uint8_t
@@ -1203,8 +1211,8 @@ enum class DlOperationSource : uint8_t
     kRemote            = 0x07,
     kRfid              = 0x08,
     kBiometric         = 0x09,
+    // kUnknownEnumValue = 10,
 };
-static DlOperationSource __attribute__((unused)) kDlOperationSourceFirstUnusedEnumVal = static_cast<DlOperationSource>(10);
 
 // Enum for DlStatus
 enum class DlStatus : uint8_t
@@ -1216,8 +1224,8 @@ enum class DlStatus : uint8_t
     kInvalidField      = 0x85,
     kResourceExhausted = 0x89,
     kNotFound          = 0x8B,
+    // kUnknownEnumValue = 4,
 };
-static DlStatus __attribute__((unused)) kDlStatusFirstUnusedEnumVal = static_cast<DlStatus>(4);
 
 // Enum for DlUserStatus
 enum class DlUserStatus : uint8_t
@@ -1225,8 +1233,8 @@ enum class DlUserStatus : uint8_t
     kAvailable        = 0x00,
     kOccupiedEnabled  = 0x01,
     kOccupiedDisabled = 0x03,
+    // kUnknownEnumValue = 2,
 };
-static DlUserStatus __attribute__((unused)) kDlUserStatusFirstUnusedEnumVal = static_cast<DlUserStatus>(2);
 
 // Enum for DlUserType
 enum class DlUserType : uint8_t
@@ -1241,8 +1249,8 @@ enum class DlUserType : uint8_t
     kExpiringUser           = 0x07,
     kScheduleRestrictedUser = 0x08,
     kRemoteOnlyUser         = 0x09,
+    // kUnknownEnumValue = 10,
 };
-static DlUserType __attribute__((unused)) kDlUserTypeFirstUnusedEnumVal = static_cast<DlUserType>(10);
 
 // Enum for DoorLockOperationEventCode
 enum class DoorLockOperationEventCode : uint8_t
@@ -1262,9 +1270,8 @@ enum class DoorLockOperationEventCode : uint8_t
     kScheduleUnlock        = 0x0C,
     kManualLock            = 0x0D,
     kManualUnlock          = 0x0E,
+    // kUnknownEnumValue = 15,
 };
-static DoorLockOperationEventCode __attribute__((unused)) kDoorLockOperationEventCodeFirstUnusedEnumVal =
-    static_cast<DoorLockOperationEventCode>(15);
 
 // Enum for DoorLockProgrammingEventCode
 enum class DoorLockProgrammingEventCode : uint8_t
@@ -1276,9 +1283,8 @@ enum class DoorLockProgrammingEventCode : uint8_t
     kPinChanged           = 0x04,
     kIdAdded              = 0x05,
     kIdDeleted            = 0x06,
+    // kUnknownEnumValue = 7,
 };
-static DoorLockProgrammingEventCode __attribute__((unused)) kDoorLockProgrammingEventCodeFirstUnusedEnumVal =
-    static_cast<DoorLockProgrammingEventCode>(7);
 
 // Enum for DoorLockSetPinOrIdStatus
 enum class DoorLockSetPinOrIdStatus : uint8_t
@@ -1287,9 +1293,8 @@ enum class DoorLockSetPinOrIdStatus : uint8_t
     kGeneralFailure     = 0x01,
     kMemoryFull         = 0x02,
     kDuplicateCodeError = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static DoorLockSetPinOrIdStatus __attribute__((unused)) kDoorLockSetPinOrIdStatusFirstUnusedEnumVal =
-    static_cast<DoorLockSetPinOrIdStatus>(4);
 
 // Enum for DoorLockUserStatus
 enum class DoorLockUserStatus : uint8_t
@@ -1298,8 +1303,8 @@ enum class DoorLockUserStatus : uint8_t
     kOccupiedEnabled  = 0x01,
     kOccupiedDisabled = 0x03,
     kNotSupported     = 0xFF,
+    // kUnknownEnumValue = 2,
 };
-static DoorLockUserStatus __attribute__((unused)) kDoorLockUserStatusFirstUnusedEnumVal = static_cast<DoorLockUserStatus>(2);
 
 // Enum for DoorLockUserType
 enum class DoorLockUserType : uint8_t
@@ -1310,8 +1315,8 @@ enum class DoorLockUserType : uint8_t
     kMasterUser          = 0x03,
     kNonAccessUser       = 0x04,
     kNotSupported        = 0xFF,
+    // kUnknownEnumValue = 5,
 };
-static DoorLockUserType __attribute__((unused)) kDoorLockUserTypeFirstUnusedEnumVal = static_cast<DoorLockUserType>(5);
 
 // Bitmap for DlCredentialRuleMask
 enum class DlCredentialRuleMask : uint8_t
@@ -1512,8 +1517,8 @@ enum class EndProductType : uint8_t
     kSwingingShutter           = 0x16,
     kSlidingShutter            = 0x17,
     kUnknown                   = 0xFF,
+    // kUnknownEnumValue = 24,
 };
-static EndProductType __attribute__((unused)) kEndProductTypeFirstUnusedEnumVal = static_cast<EndProductType>(24);
 
 // Enum for Type
 enum class Type : uint8_t
@@ -1529,8 +1534,8 @@ enum class Type : uint8_t
     kTiltBlindLiftAndTilt      = 0x08,
     kProjectorScreen           = 0x09,
     kUnknown                   = 0xFF,
+    // kUnknownEnumValue = 10,
 };
-static Type __attribute__((unused)) kTypeFirstUnusedEnumVal = static_cast<Type>(10);
 
 // Bitmap for ConfigStatus
 enum class ConfigStatus : uint8_t
@@ -1603,8 +1608,8 @@ enum class PumpControlMode : uint8_t
     kConstantFlow         = 0x03,
     kConstantTemperature  = 0x05,
     kAutomatic            = 0x07,
+    // kUnknownEnumValue = 4,
 };
-static PumpControlMode __attribute__((unused)) kPumpControlModeFirstUnusedEnumVal = static_cast<PumpControlMode>(4);
 
 // Enum for PumpOperationMode
 enum class PumpOperationMode : uint8_t
@@ -1613,8 +1618,8 @@ enum class PumpOperationMode : uint8_t
     kMinimum = 0x01,
     kMaximum = 0x02,
     kLocal   = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static PumpOperationMode __attribute__((unused)) kPumpOperationModeFirstUnusedEnumVal = static_cast<PumpOperationMode>(4);
 
 // Bitmap for PumpStatus
 enum class PumpStatus : uint16_t
@@ -1642,11 +1647,12 @@ enum class SetpointAdjustMode : uint8_t
     kHeatSetpoint         = 0x00,
     kCoolSetpoint         = 0x01,
     kHeatAndCoolSetpoints = 0x02,
+    // kUnknownEnumValue = 3,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using SetpointAdjustMode              = EmberAfSetpointAdjustMode;
+using SetpointAdjustMode                                                               = EmberAfSetpointAdjustMode;
+static SetpointAdjustMode __attribute__((unused)) kSetpointAdjustModekUnknownEnumValue = static_cast<SetpointAdjustMode>(3);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static SetpointAdjustMode __attribute__((unused)) kSetpointAdjustModeFirstUnusedEnumVal = static_cast<SetpointAdjustMode>(3);
 
 // Enum for ThermostatControlSequence
 enum class ThermostatControlSequence : uint8_t
@@ -1657,9 +1663,8 @@ enum class ThermostatControlSequence : uint8_t
     kHeatingWithReheat           = 0x03,
     kCoolingAndHeating           = 0x04,
     kCoolingAndHeatingWithReheat = 0x05,
+    // kUnknownEnumValue = 6,
 };
-static ThermostatControlSequence __attribute__((unused)) kThermostatControlSequenceFirstUnusedEnumVal =
-    static_cast<ThermostatControlSequence>(6);
 
 // Enum for ThermostatRunningMode
 enum class ThermostatRunningMode : uint8_t
@@ -1667,9 +1672,8 @@ enum class ThermostatRunningMode : uint8_t
     kOff  = 0x00,
     kCool = 0x03,
     kHeat = 0x04,
+    // kUnknownEnumValue = 1,
 };
-static ThermostatRunningMode __attribute__((unused)) kThermostatRunningModeFirstUnusedEnumVal =
-    static_cast<ThermostatRunningMode>(1);
 
 // Enum for ThermostatSystemMode
 enum class ThermostatSystemMode : uint8_t
@@ -1681,8 +1685,8 @@ enum class ThermostatSystemMode : uint8_t
     kEmergencyHeating = 0x05,
     kPrecooling       = 0x06,
     kFanOnly          = 0x07,
+    // kUnknownEnumValue = 2,
 };
-static ThermostatSystemMode __attribute__((unused)) kThermostatSystemModeFirstUnusedEnumVal = static_cast<ThermostatSystemMode>(2);
 
 // Bitmap for DayOfWeek
 enum class DayOfWeek : uint8_t
@@ -1727,8 +1731,8 @@ enum class FanModeSequenceType : uint8_t
     kOffLowHighAuto    = 0x03,
     kOffOnAuto         = 0x04,
     kOffOn             = 0x05,
+    // kUnknownEnumValue = 6,
 };
-static FanModeSequenceType __attribute__((unused)) kFanModeSequenceTypeFirstUnusedEnumVal = static_cast<FanModeSequenceType>(6);
 
 // Enum for FanModeType
 enum class FanModeType : uint8_t
@@ -1740,8 +1744,8 @@ enum class FanModeType : uint8_t
     kOn     = 0x04,
     kAuto   = 0x05,
     kSmart  = 0x06,
+    // kUnknownEnumValue = 7,
 };
-static FanModeType __attribute__((unused)) kFanModeTypeFirstUnusedEnumVal = static_cast<FanModeType>(7);
 
 // Bitmap for FanControlFeature
 enum class FanControlFeature : uint32_t
@@ -1792,11 +1796,12 @@ enum class ColorLoopAction : uint8_t
     kDeactivate                            = 0x00,
     kActivateFromColorLoopStartEnhancedHue = 0x01,
     kActivateFromEnhancedCurrentHue        = 0x02,
+    // kUnknownEnumValue = 3,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using ColorLoopAction                 = EmberAfColorLoopAction;
+using ColorLoopAction                                                                  = EmberAfColorLoopAction;
+static ColorLoopAction __attribute__((unused)) kColorLoopActionkUnknownEnumValue       = static_cast<ColorLoopAction>(3);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static ColorLoopAction __attribute__((unused)) kColorLoopActionFirstUnusedEnumVal = static_cast<ColorLoopAction>(3);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1806,11 +1811,12 @@ enum class ColorLoopDirection : uint8_t
 {
     kDecrementHue = 0x00,
     kIncrementHue = 0x01,
+    // kUnknownEnumValue = 2,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using ColorLoopDirection              = EmberAfColorLoopDirection;
+using ColorLoopDirection                                                               = EmberAfColorLoopDirection;
+static ColorLoopDirection __attribute__((unused)) kColorLoopDirectionkUnknownEnumValue = static_cast<ColorLoopDirection>(2);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static ColorLoopDirection __attribute__((unused)) kColorLoopDirectionFirstUnusedEnumVal = static_cast<ColorLoopDirection>(2);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1821,11 +1827,12 @@ enum class ColorMode : uint8_t
     kCurrentHueAndCurrentSaturation = 0x00,
     kCurrentXAndCurrentY            = 0x01,
     kColorTemperature               = 0x02,
+    // kUnknownEnumValue = 3,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using ColorMode                       = EmberAfColorMode;
+using ColorMode                                                                        = EmberAfColorMode;
+static ColorMode __attribute__((unused)) kColorModekUnknownEnumValue                   = static_cast<ColorMode>(3);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static ColorMode __attribute__((unused)) kColorModeFirstUnusedEnumVal = static_cast<ColorMode>(3);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1837,11 +1844,12 @@ enum class HueDirection : uint8_t
     kLongestDistance  = 0x01,
     kUp               = 0x02,
     kDown             = 0x03,
+    // kUnknownEnumValue = 4,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using HueDirection                    = EmberAfHueDirection;
+using HueDirection                                                                     = EmberAfHueDirection;
+static HueDirection __attribute__((unused)) kHueDirectionkUnknownEnumValue             = static_cast<HueDirection>(4);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static HueDirection __attribute__((unused)) kHueDirectionFirstUnusedEnumVal = static_cast<HueDirection>(4);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1852,11 +1860,12 @@ enum class HueMoveMode : uint8_t
     kStop = 0x00,
     kUp   = 0x01,
     kDown = 0x03,
+    // kUnknownEnumValue = 2,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using HueMoveMode                     = EmberAfHueMoveMode;
+using HueMoveMode                                                                      = EmberAfHueMoveMode;
+static HueMoveMode __attribute__((unused)) kHueMoveModekUnknownEnumValue               = static_cast<HueMoveMode>(2);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static HueMoveMode __attribute__((unused)) kHueMoveModeFirstUnusedEnumVal = static_cast<HueMoveMode>(2);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1866,11 +1875,12 @@ enum class HueStepMode : uint8_t
 {
     kUp   = 0x01,
     kDown = 0x03,
+    // kUnknownEnumValue = 0,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using HueStepMode                     = EmberAfHueStepMode;
+using HueStepMode                                                                      = EmberAfHueStepMode;
+static HueStepMode __attribute__((unused)) kHueStepModekUnknownEnumValue               = static_cast<HueStepMode>(0);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static HueStepMode __attribute__((unused)) kHueStepModeFirstUnusedEnumVal = static_cast<HueStepMode>(0);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1881,11 +1891,12 @@ enum class SaturationMoveMode : uint8_t
     kStop = 0x00,
     kUp   = 0x01,
     kDown = 0x03,
+    // kUnknownEnumValue = 2,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using SaturationMoveMode              = EmberAfSaturationMoveMode;
+using SaturationMoveMode                                                               = EmberAfSaturationMoveMode;
+static SaturationMoveMode __attribute__((unused)) kSaturationMoveModekUnknownEnumValue = static_cast<SaturationMoveMode>(2);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static SaturationMoveMode __attribute__((unused)) kSaturationMoveModeFirstUnusedEnumVal = static_cast<SaturationMoveMode>(2);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1895,11 +1906,12 @@ enum class SaturationStepMode : uint8_t
 {
     kUp   = 0x01,
     kDown = 0x03,
+    // kUnknownEnumValue = 0,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using SaturationStepMode              = EmberAfSaturationStepMode;
+using SaturationStepMode                                                               = EmberAfSaturationStepMode;
+static SaturationStepMode __attribute__((unused)) kSaturationStepModekUnknownEnumValue = static_cast<SaturationStepMode>(0);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-static SaturationStepMode __attribute__((unused)) kSaturationStepModeFirstUnusedEnumVal = static_cast<SaturationStepMode>(0);
 
 // Bitmap for ColorCapabilities
 enum class ColorCapabilities : uint16_t
@@ -1941,8 +1953,8 @@ enum class LightSensorType : uint8_t
 {
     kPhotodiode = 0x00,
     kCmos       = 0x01,
+    // kUnknownEnumValue = 2,
 };
-static LightSensorType __attribute__((unused)) kLightSensorTypeFirstUnusedEnumVal = static_cast<LightSensorType>(2);
 } // namespace IlluminanceMeasurement
 
 namespace TemperatureMeasurement {
@@ -2067,15 +2079,15 @@ enum class ChannelStatusEnum : uint8_t
     kSuccess         = 0x00,
     kMultipleMatches = 0x01,
     kNoMatches       = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static ChannelStatusEnum __attribute__((unused)) kChannelStatusEnumFirstUnusedEnumVal = static_cast<ChannelStatusEnum>(3);
 
 // Enum for LineupInfoTypeEnum
 enum class LineupInfoTypeEnum : uint8_t
 {
     kMso = 0x00,
+    // kUnknownEnumValue = 1,
 };
-static LineupInfoTypeEnum __attribute__((unused)) kLineupInfoTypeEnumFirstUnusedEnumVal = static_cast<LineupInfoTypeEnum>(1);
 
 // Bitmap for ChannelFeature
 enum class ChannelFeature : uint32_t
@@ -2093,9 +2105,8 @@ enum class TargetNavigatorStatusEnum : uint8_t
     kSuccess        = 0x00,
     kTargetNotFound = 0x01,
     kNotAllowed     = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static TargetNavigatorStatusEnum __attribute__((unused)) kTargetNavigatorStatusEnumFirstUnusedEnumVal =
-    static_cast<TargetNavigatorStatusEnum>(3);
 } // namespace TargetNavigator
 
 namespace MediaPlayback {
@@ -2109,9 +2120,8 @@ enum class MediaPlaybackStatusEnum : uint8_t
     kNotActive              = 0x03,
     kSpeedOutOfRange        = 0x04,
     kSeekOutOfRange         = 0x05,
+    // kUnknownEnumValue = 6,
 };
-static MediaPlaybackStatusEnum __attribute__((unused)) kMediaPlaybackStatusEnumFirstUnusedEnumVal =
-    static_cast<MediaPlaybackStatusEnum>(6);
 
 // Enum for PlaybackStateEnum
 enum class PlaybackStateEnum : uint8_t
@@ -2120,8 +2130,8 @@ enum class PlaybackStateEnum : uint8_t
     kPaused     = 0x01,
     kNotPlaying = 0x02,
     kBuffering  = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static PlaybackStateEnum __attribute__((unused)) kPlaybackStateEnumFirstUnusedEnumVal = static_cast<PlaybackStateEnum>(4);
 } // namespace MediaPlayback
 
 namespace MediaInput {
@@ -2141,8 +2151,8 @@ enum class InputTypeEnum : uint8_t
     kScart     = 0x09,
     kUsb       = 0x0A,
     kOther     = 0x0B,
+    // kUnknownEnumValue = 12,
 };
-static InputTypeEnum __attribute__((unused)) kInputTypeEnumFirstUnusedEnumVal = static_cast<InputTypeEnum>(12);
 
 // Bitmap for MediaInputFeature
 enum class MediaInputFeature : uint32_t
@@ -2245,8 +2255,8 @@ enum class CecKeyCode : uint8_t
     kF4Yellow                  = 0x74,
     kF5                        = 0x75,
     kData                      = 0x76,
+    // kUnknownEnumValue = 14,
 };
-static CecKeyCode __attribute__((unused)) kCecKeyCodeFirstUnusedEnumVal = static_cast<CecKeyCode>(14);
 
 // Enum for KeypadInputStatusEnum
 enum class KeypadInputStatusEnum : uint8_t
@@ -2254,9 +2264,8 @@ enum class KeypadInputStatusEnum : uint8_t
     kSuccess                  = 0x00,
     kUnsupportedKey           = 0x01,
     kInvalidKeyInCurrentState = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static KeypadInputStatusEnum __attribute__((unused)) kKeypadInputStatusEnumFirstUnusedEnumVal =
-    static_cast<KeypadInputStatusEnum>(3);
 
 // Bitmap for KeypadInputFeature
 enum class KeypadInputFeature : uint32_t
@@ -2275,17 +2284,16 @@ enum class ContentLaunchStatusEnum : uint8_t
     kSuccess         = 0x00,
     kUrlNotAvailable = 0x01,
     kAuthFailed      = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static ContentLaunchStatusEnum __attribute__((unused)) kContentLaunchStatusEnumFirstUnusedEnumVal =
-    static_cast<ContentLaunchStatusEnum>(3);
 
 // Enum for MetricTypeEnum
 enum class MetricTypeEnum : uint8_t
 {
     kPixels     = 0x00,
     kPercentage = 0x01,
+    // kUnknownEnumValue = 2,
 };
-static MetricTypeEnum __attribute__((unused)) kMetricTypeEnumFirstUnusedEnumVal = static_cast<MetricTypeEnum>(2);
 
 // Enum for ParameterEnum
 enum class ParameterEnum : uint8_t
@@ -2303,8 +2311,8 @@ enum class ParameterEnum : uint8_t
     kSport      = 0x0A,
     kSportsTeam = 0x0B,
     kType       = 0x0C,
+    // kUnknownEnumValue = 13,
 };
-static ParameterEnum __attribute__((unused)) kParameterEnumFirstUnusedEnumVal = static_cast<ParameterEnum>(13);
 
 // Bitmap for ContentLauncherFeature
 enum class ContentLauncherFeature : uint32_t
@@ -2332,8 +2340,8 @@ enum class OutputTypeEnum : uint8_t
     kHeadphone = 0x03,
     kInternal  = 0x04,
     kOther     = 0x05,
+    // kUnknownEnumValue = 6,
 };
-static OutputTypeEnum __attribute__((unused)) kOutputTypeEnumFirstUnusedEnumVal = static_cast<OutputTypeEnum>(6);
 
 // Bitmap for AudioOutputFeature
 enum class AudioOutputFeature : uint32_t
@@ -2350,9 +2358,8 @@ enum class ApplicationLauncherStatusEnum : uint8_t
     kSuccess         = 0x00,
     kAppNotAvailable = 0x01,
     kSystemBusy      = 0x02,
+    // kUnknownEnumValue = 3,
 };
-static ApplicationLauncherStatusEnum __attribute__((unused)) kApplicationLauncherStatusEnumFirstUnusedEnumVal =
-    static_cast<ApplicationLauncherStatusEnum>(3);
 
 // Bitmap for ApplicationLauncherFeature
 enum class ApplicationLauncherFeature : uint32_t
@@ -2370,9 +2377,8 @@ enum class ApplicationStatusEnum : uint8_t
     kActiveVisibleFocus    = 0x01,
     kActiveHidden          = 0x02,
     kActiveVisibleNotFocus = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static ApplicationStatusEnum __attribute__((unused)) kApplicationStatusEnumFirstUnusedEnumVal =
-    static_cast<ApplicationStatusEnum>(4);
 } // namespace ApplicationBasic
 
 namespace AccountLogin {
@@ -2394,8 +2400,8 @@ enum class EventIdentification : uint8_t
     kEndOfCooking       = 0x05,
     kSwitchingOff       = 0x06,
     kWrongData          = 0x07,
+    // kUnknownEnumValue = 0,
 };
-static EventIdentification __attribute__((unused)) kEventIdentificationFirstUnusedEnumVal = static_cast<EventIdentification>(0);
 
 // Bitmap for AlertCount
 enum class AlertCount : uint8_t
@@ -2428,8 +2434,8 @@ enum class SimpleEnum : uint8_t
     kValueA      = 0x01,
     kValueB      = 0x02,
     kValueC      = 0x03,
+    // kUnknownEnumValue = 4,
 };
-static SimpleEnum __attribute__((unused)) kSimpleEnumFirstUnusedEnumVal = static_cast<SimpleEnum>(4);
 
 // Bitmap for Bitmap16MaskMap
 enum class Bitmap16MaskMap : uint16_t