diff --git a/src/app/data-model/Decode.h b/src/app/data-model/Decode.h
index 4907ca54f11fcb..6e31d22b4aafb4 100644
--- a/src/app/data-model/Decode.h
+++ b/src/app/data-model/Decode.h
@@ -57,7 +57,7 @@ template <typename X, typename std::enable_if_t<std::is_enum<X>::value, int> = 0
 CHIP_ERROR Decode(TLV::TLVReader & reader, X & x)
 {
     ReturnErrorOnFailure(reader.Get(x));
-    x = chip::app::Clusters::EnsureKnownEnumValue(x);
+    x = Clusters::EnsureKnownEnumValue(x);
     return CHIP_NO_ERROR;
 }
 
diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml
index 58334772b2b441..e1ddaba5939780 100644
--- a/src/app/tests/suites/TestCluster.yaml
+++ b/src/app/tests/suites/TestCluster.yaml
@@ -2801,8 +2801,8 @@ tests:
       command: "readAttribute"
       attribute: "nullable_enum_attr"
       response:
-          saveAs: nullableEnumAttr4
-          value: 4
+          saveAs: nullableEnumAttr3
+          value: 3
 
     - label: "Write attribute NULLABLE_SIMPLE_ENUM null Value"
       command: "writeAttribute"
@@ -2816,12 +2816,12 @@ tests:
       response:
           value: null
 
-    - label: "Read attribute NULLABLE_SIMPLE_ENUM not 254 Value"
+    - label: "Read attribute NULLABLE_SIMPLE_ENUM not 3 Value"
       command: "readAttribute"
       attribute: "nullable_enum_attr"
       response:
           constraints:
-              notValue: nullableEnumAttr4
+              notValue: nullableEnumAttr3
 
     # Tests for Octet String attribute
 
diff --git a/src/app/zap-templates/templates/app/cluster-enums.zapt b/src/app/zap-templates/templates/app/cluster-enums.zapt
index 005a4c5b2756d9..0f2ae2bb7a2181 100644
--- a/src/app/zap-templates/templates/app/cluster-enums.zapt
+++ b/src/app/zap-templates/templates/app/cluster-enums.zapt
@@ -30,6 +30,7 @@ k{{asUpperCamelCase label}} = {{asHex value 2}},
 using {{asType label}} = EmberAf{{asType label}};
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 {{/if}}
+static {{asType label}} 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 c69770eaf83535..d5a7b370857b59 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
@@ -51,6 +51,7 @@ enum class IdentifyEffectIdentifier : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using IdentifyEffectIdentifier        = EmberAfIdentifyEffectIdentifier;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static IdentifyEffectIdentifier kIdentifyEffectIdentifierFirstUnusedEnumVal = static_cast<IdentifyEffectIdentifier>(3);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -63,6 +64,7 @@ enum class IdentifyEffectVariant : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using IdentifyEffectVariant           = EmberAfIdentifyEffectVariant;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static IdentifyEffectVariant kIdentifyEffectVariantFirstUnusedEnumVal = static_cast<IdentifyEffectVariant>(1);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -80,6 +82,7 @@ enum class IdentifyIdentifyType : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using IdentifyIdentifyType            = EmberAfIdentifyIdentifyType;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static IdentifyIdentifyType kIdentifyIdentifyTypeFirstUnusedEnumVal = static_cast<IdentifyIdentifyType>(6);
 } // namespace Identify
 
 namespace Groups {
@@ -115,6 +118,8 @@ enum class OnOffDelayedAllOffEffectVariant : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using OnOffDelayedAllOffEffectVariant = EmberAfOnOffDelayedAllOffEffectVariant;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static OnOffDelayedAllOffEffectVariant kOnOffDelayedAllOffEffectVariantFirstUnusedEnumVal =
+    static_cast<OnOffDelayedAllOffEffectVariant>(3);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -127,6 +132,7 @@ enum class OnOffDyingLightEffectVariant : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using OnOffDyingLightEffectVariant    = EmberAfOnOffDyingLightEffectVariant;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static OnOffDyingLightEffectVariant kOnOffDyingLightEffectVariantFirstUnusedEnumVal = static_cast<OnOffDyingLightEffectVariant>(1);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -140,6 +146,7 @@ enum class OnOffEffectIdentifier : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using OnOffEffectIdentifier           = EmberAfOnOffEffectIdentifier;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static OnOffEffectIdentifier kOnOffEffectIdentifierFirstUnusedEnumVal = static_cast<OnOffEffectIdentifier>(2);
 
 // Enum for OnOffStartUpOnOff
 enum class OnOffStartUpOnOff : uint8_t
@@ -148,6 +155,7 @@ enum class OnOffStartUpOnOff : uint8_t
     kOn                  = 0x01,
     kTogglePreviousOnOff = 0x02,
 };
+static OnOffStartUpOnOff kOnOffStartUpOnOffFirstUnusedEnumVal = static_cast<OnOffStartUpOnOff>(3);
 
 // Bitmap for OnOffControl
 enum class OnOffControl : uint8_t
@@ -185,6 +193,7 @@ enum class MoveMode : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using MoveMode                        = EmberAfMoveMode;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static MoveMode kMoveModeFirstUnusedEnumVal = static_cast<MoveMode>(2);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -198,6 +207,7 @@ enum class StepMode : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using StepMode                        = EmberAfStepMode;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static StepMode kStepModeFirstUnusedEnumVal = static_cast<StepMode>(2);
 
 // Bitmap for LevelControlFeature
 enum class LevelControlFeature : uint32_t
@@ -241,6 +251,7 @@ enum class ApplianceStatus : uint8_t
     kSupercooling             = 0x0E,
     kSuperheating             = 0x0F,
 };
+static ApplianceStatus kApplianceStatusFirstUnusedEnumVal = static_cast<ApplianceStatus>(0);
 
 // Enum for CommandIdentification
 enum class CommandIdentification : uint8_t
@@ -257,6 +268,7 @@ enum class CommandIdentification : uint8_t
     kEnableEnergyControl  = 0x0A,
     kDisableEnergyControl = 0x0B,
 };
+static CommandIdentification kCommandIdentificationFirstUnusedEnumVal = static_cast<CommandIdentification>(0);
 
 // Enum for WarningEvent
 enum class WarningEvent : uint8_t
@@ -267,6 +279,7 @@ enum class WarningEvent : uint8_t
     kWarning4OverallPowerBackBelowThePowerThresholdLevel                               = 0x03,
     kWarning5OverallPowerWillBePotentiallyAboveAvailablePowerLevelIfTheApplianceStarts = 0x04,
 };
+static WarningEvent kWarningEventFirstUnusedEnumVal = static_cast<WarningEvent>(5);
 
 // Bitmap for RemoteEnableFlagsAndDeviceStatus2
 enum class RemoteEnableFlagsAndDeviceStatus2 : uint8_t
@@ -294,6 +307,7 @@ enum class AuthMode : uint8_t
     kCase  = 0x02,
     kGroup = 0x03,
 };
+static AuthMode kAuthModeFirstUnusedEnumVal = static_cast<AuthMode>(0);
 
 // Enum for ChangeTypeEnum
 enum class ChangeTypeEnum : uint8_t
@@ -302,6 +316,7 @@ enum class ChangeTypeEnum : uint8_t
     kAdded   = 0x01,
     kRemoved = 0x02,
 };
+static ChangeTypeEnum kChangeTypeEnumFirstUnusedEnumVal = static_cast<ChangeTypeEnum>(3);
 
 // Enum for Privilege
 enum class Privilege : uint8_t
@@ -312,6 +327,7 @@ enum class Privilege : uint8_t
     kManage     = 0x04,
     kAdminister = 0x05,
 };
+static Privilege kPrivilegeFirstUnusedEnumVal = static_cast<Privilege>(0);
 } // namespace AccessControl
 
 namespace PollControl {
@@ -325,6 +341,7 @@ enum class ActionErrorEnum : uint8_t
     kUnknown     = 0x00,
     kInterrupted = 0x01,
 };
+static ActionErrorEnum kActionErrorEnumFirstUnusedEnumVal = static_cast<ActionErrorEnum>(2);
 
 // Enum for ActionStateEnum
 enum class ActionStateEnum : uint8_t
@@ -334,6 +351,7 @@ enum class ActionStateEnum : uint8_t
     kPaused   = 0x02,
     kDisabled = 0x03,
 };
+static ActionStateEnum kActionStateEnumFirstUnusedEnumVal = static_cast<ActionStateEnum>(4);
 
 // Enum for ActionTypeEnum
 enum class ActionTypeEnum : uint8_t
@@ -346,6 +364,7 @@ enum class ActionTypeEnum : uint8_t
     kNotification = 0x05,
     kAlarm        = 0x06,
 };
+static ActionTypeEnum kActionTypeEnumFirstUnusedEnumVal = static_cast<ActionTypeEnum>(7);
 
 // Enum for EndpointListTypeEnum
 enum class EndpointListTypeEnum : uint8_t
@@ -354,6 +373,7 @@ enum class EndpointListTypeEnum : uint8_t
     kRoom  = 0x01,
     kZone  = 0x02,
 };
+static EndpointListTypeEnum kEndpointListTypeEnumFirstUnusedEnumVal = static_cast<EndpointListTypeEnum>(3);
 
 // Bitmap for CommandBits
 enum class CommandBits : uint16_t
@@ -385,6 +405,7 @@ enum class OTAApplyUpdateAction : uint8_t
     kAwaitNextAction = 0x01,
     kDiscontinue     = 0x02,
 };
+static OTAApplyUpdateAction kOTAApplyUpdateActionFirstUnusedEnumVal = static_cast<OTAApplyUpdateAction>(3);
 
 // Enum for OTADownloadProtocol
 enum class OTADownloadProtocol : uint8_t
@@ -394,6 +415,7 @@ enum class OTADownloadProtocol : uint8_t
     kHttps           = 0x02,
     kVendorSpecific  = 0x03,
 };
+static OTADownloadProtocol kOTADownloadProtocolFirstUnusedEnumVal = static_cast<OTADownloadProtocol>(4);
 
 // Enum for OTAQueryStatus
 enum class OTAQueryStatus : uint8_t
@@ -403,6 +425,7 @@ enum class OTAQueryStatus : uint8_t
     kNotAvailable                 = 0x02,
     kDownloadProtocolNotSupported = 0x03,
 };
+static OTAQueryStatus kOTAQueryStatusFirstUnusedEnumVal = static_cast<OTAQueryStatus>(4);
 } // namespace OtaSoftwareUpdateProvider
 
 namespace OtaSoftwareUpdateRequestor {
@@ -414,6 +437,7 @@ enum class OTAAnnouncementReason : uint8_t
     kUpdateAvailable       = 0x01,
     kUrgentUpdateAvailable = 0x02,
 };
+static OTAAnnouncementReason kOTAAnnouncementReasonFirstUnusedEnumVal = static_cast<OTAAnnouncementReason>(3);
 
 // Enum for OTAChangeReasonEnum
 enum class OTAChangeReasonEnum : uint8_t
@@ -424,6 +448,7 @@ enum class OTAChangeReasonEnum : uint8_t
     kTimeOut         = 0x03,
     kDelayByProvider = 0x04,
 };
+static OTAChangeReasonEnum kOTAChangeReasonEnumFirstUnusedEnumVal = static_cast<OTAChangeReasonEnum>(5);
 
 // Enum for OTAUpdateStateEnum
 enum class OTAUpdateStateEnum : uint8_t
@@ -438,6 +463,7 @@ enum class OTAUpdateStateEnum : uint8_t
     kRollingBack          = 0x07,
     kDelayedOnUserConsent = 0x08,
 };
+static OTAUpdateStateEnum kOTAUpdateStateEnumFirstUnusedEnumVal = static_cast<OTAUpdateStateEnum>(9);
 } // namespace OtaSoftwareUpdateRequestor
 
 namespace LocalizationConfiguration {
@@ -461,6 +487,7 @@ enum class CalendarType : uint8_t
     kPersian   = 0x0A,
     kTaiwanese = 0x0B,
 };
+static CalendarType kCalendarTypeFirstUnusedEnumVal = static_cast<CalendarType>(12);
 
 // Enum for HourFormat
 enum class HourFormat : uint8_t
@@ -468,6 +495,7 @@ enum class HourFormat : uint8_t
     k12hr = 0x00,
     k24hr = 0x01,
 };
+static HourFormat kHourFormatFirstUnusedEnumVal = static_cast<HourFormat>(2);
 } // namespace TimeFormatLocalization
 
 namespace UnitLocalization {
@@ -479,6 +507,7 @@ enum class TempUnit : uint8_t
     kCelsius    = 0x01,
     kKelvin     = 0x02,
 };
+static TempUnit kTempUnitFirstUnusedEnumVal = static_cast<TempUnit>(3);
 
 // Bitmap for UnitLocalizationFeature
 enum class UnitLocalizationFeature : uint32_t
@@ -507,6 +536,7 @@ enum class BatChargeFault : uint8_t
     kChargerUnderVoltage = 0x09,
     kSafetyTimeout       = 0x0A,
 };
+static BatChargeFault kBatChargeFaultFirstUnusedEnumVal = static_cast<BatChargeFault>(11);
 
 // Enum for BatChargeLevel
 enum class BatChargeLevel : uint8_t
@@ -515,6 +545,7 @@ enum class BatChargeLevel : uint8_t
     kWarning  = 0x01,
     kCritical = 0x02,
 };
+static BatChargeLevel kBatChargeLevelFirstUnusedEnumVal = static_cast<BatChargeLevel>(3);
 
 // Enum for BatChargeState
 enum class BatChargeState : uint8_t
@@ -524,6 +555,7 @@ enum class BatChargeState : uint8_t
     kIsAtFullCharge = 0x02,
     kIsNotCharging  = 0x03,
 };
+static BatChargeState kBatChargeStateFirstUnusedEnumVal = static_cast<BatChargeState>(4);
 
 // Enum for BatFault
 enum class BatFault : uint8_t
@@ -532,6 +564,7 @@ enum class BatFault : uint8_t
     kOverTemp   = 0x01,
     kUnderTemp  = 0x02,
 };
+static BatFault kBatFaultFirstUnusedEnumVal = static_cast<BatFault>(3);
 
 // Enum for BatReplaceability
 enum class BatReplaceability : uint8_t
@@ -541,6 +574,7 @@ enum class BatReplaceability : uint8_t
     kUserReplaceable    = 0x02,
     kFactoryReplaceable = 0x03,
 };
+static BatReplaceability kBatReplaceabilityFirstUnusedEnumVal = static_cast<BatReplaceability>(4);
 
 // Enum for PowerSourceStatus
 enum class PowerSourceStatus : uint8_t
@@ -550,6 +584,7 @@ enum class PowerSourceStatus : uint8_t
     kStandby     = 0x02,
     kUnavailable = 0x03,
 };
+static PowerSourceStatus kPowerSourceStatusFirstUnusedEnumVal = static_cast<PowerSourceStatus>(4);
 
 // Enum for WiredCurrentType
 enum class WiredCurrentType : uint8_t
@@ -557,6 +592,7 @@ enum class WiredCurrentType : uint8_t
     kAc = 0x00,
     kDc = 0x01,
 };
+static WiredCurrentType kWiredCurrentTypeFirstUnusedEnumVal = static_cast<WiredCurrentType>(2);
 
 // Enum for WiredFault
 enum class WiredFault : uint8_t
@@ -565,6 +601,7 @@ enum class WiredFault : uint8_t
     kOverVoltage  = 0x01,
     kUnderVoltage = 0x02,
 };
+static WiredFault kWiredFaultFirstUnusedEnumVal = static_cast<WiredFault>(3);
 
 // Bitmap for PowerSourceFeature
 enum class PowerSourceFeature : uint32_t
@@ -587,6 +624,7 @@ enum class CommissioningError : uint8_t
     kNoFailSafe            = 0x03,
     kBusyWithOtherAdmin    = 0x04,
 };
+static CommissioningError kCommissioningErrorFirstUnusedEnumVal = static_cast<CommissioningError>(5);
 
 // Enum for RegulatoryLocationType
 enum class RegulatoryLocationType : uint8_t
@@ -595,6 +633,7 @@ enum class RegulatoryLocationType : uint8_t
     kOutdoor       = 0x01,
     kIndoorOutdoor = 0x02,
 };
+static RegulatoryLocationType kRegulatoryLocationTypeFirstUnusedEnumVal = static_cast<RegulatoryLocationType>(3);
 } // namespace GeneralCommissioning
 
 namespace NetworkCommissioning {
@@ -616,6 +655,7 @@ enum class NetworkCommissioningStatus : uint8_t
     kIPBindFailed           = 0x0B,
     kUnknownError           = 0x0C,
 };
+static NetworkCommissioningStatus kNetworkCommissioningStatusFirstUnusedEnumVal = static_cast<NetworkCommissioningStatus>(13);
 
 // Enum for WiFiBand
 enum class WiFiBand : uint8_t
@@ -626,6 +666,7 @@ enum class WiFiBand : uint8_t
     k6g   = 0x03,
     k60g  = 0x04,
 };
+static WiFiBand kWiFiBandFirstUnusedEnumVal = static_cast<WiFiBand>(5);
 
 // Bitmap for NetworkCommissioningFeature
 enum class NetworkCommissioningFeature : uint32_t
@@ -655,6 +696,7 @@ enum class LogsIntent : uint8_t
     kNetworkDiag    = 0x01,
     kCrashLogs      = 0x02,
 };
+static LogsIntent kLogsIntentFirstUnusedEnumVal = static_cast<LogsIntent>(3);
 
 // Enum for LogsStatus
 enum class LogsStatus : uint8_t
@@ -665,6 +707,7 @@ enum class LogsStatus : uint8_t
     kBusy      = 0x03,
     kDenied    = 0x04,
 };
+static LogsStatus kLogsStatusFirstUnusedEnumVal = static_cast<LogsStatus>(5);
 
 // Enum for LogsTransferProtocol
 enum class LogsTransferProtocol : uint8_t
@@ -672,6 +715,7 @@ enum class LogsTransferProtocol : uint8_t
     kResponsePayload = 0x00,
     kBdx             = 0x01,
 };
+static LogsTransferProtocol kLogsTransferProtocolFirstUnusedEnumVal = static_cast<LogsTransferProtocol>(2);
 } // namespace DiagnosticLogs
 
 namespace GeneralDiagnostics {
@@ -687,6 +731,7 @@ enum class BootReasonType : uint8_t
     kSoftwareUpdateCompleted = 0x05,
     kSoftwareReset           = 0x06,
 };
+static BootReasonType kBootReasonTypeFirstUnusedEnumVal = static_cast<BootReasonType>(7);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -709,6 +754,7 @@ enum class HardwareFaultType : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using HardwareFaultType               = EmberAfHardwareFaultType;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static HardwareFaultType kHardwareFaultTypeFirstUnusedEnumVal = static_cast<HardwareFaultType>(11);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -725,6 +771,7 @@ enum class InterfaceType : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using InterfaceType                   = EmberAfInterfaceType;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static InterfaceType kInterfaceTypeFirstUnusedEnumVal = static_cast<InterfaceType>(5);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -740,6 +787,7 @@ enum class NetworkFaultType : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using NetworkFaultType                = EmberAfNetworkFaultType;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static NetworkFaultType kNetworkFaultTypeFirstUnusedEnumVal = static_cast<NetworkFaultType>(4);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -758,6 +806,7 @@ enum class RadioFaultType : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using RadioFaultType                  = EmberAfRadioFaultType;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static RadioFaultType kRadioFaultTypeFirstUnusedEnumVal = static_cast<RadioFaultType>(7);
 } // namespace GeneralDiagnostics
 
 namespace SoftwareDiagnostics {
@@ -779,6 +828,7 @@ enum class NetworkFault : uint8_t
     kHardwareFailure = 0x02,
     kNetworkJammed   = 0x03,
 };
+static NetworkFault kNetworkFaultFirstUnusedEnumVal = static_cast<NetworkFault>(4);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -797,6 +847,7 @@ enum class RoutingRole : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using RoutingRole                     = EmberAfRoutingRole;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static RoutingRole kRoutingRoleFirstUnusedEnumVal = static_cast<RoutingRole>(7);
 
 // Enum for ThreadConnectionStatus
 enum class ThreadConnectionStatus : uint8_t
@@ -804,6 +855,7 @@ enum class ThreadConnectionStatus : uint8_t
     kConnected    = 0x00,
     kNotConnected = 0x01,
 };
+static ThreadConnectionStatus kThreadConnectionStatusFirstUnusedEnumVal = static_cast<ThreadConnectionStatus>(2);
 
 // Bitmap for ThreadNetworkDiagnosticsFeature
 enum class ThreadNetworkDiagnosticsFeature : uint32_t
@@ -825,6 +877,7 @@ enum class AssociationFailureCause : uint8_t
     kAuthenticationFailed = 0x02,
     kSsidNotFound         = 0x03,
 };
+static AssociationFailureCause kAssociationFailureCauseFirstUnusedEnumVal = static_cast<AssociationFailureCause>(4);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -842,6 +895,7 @@ enum class SecurityType : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using SecurityType                    = EmberAfSecurityType;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static SecurityType kSecurityTypeFirstUnusedEnumVal = static_cast<SecurityType>(6);
 
 // Enum for WiFiConnectionStatus
 enum class WiFiConnectionStatus : uint8_t
@@ -849,6 +903,7 @@ enum class WiFiConnectionStatus : uint8_t
     kConnected    = 0x00,
     kNotConnected = 0x01,
 };
+static WiFiConnectionStatus kWiFiConnectionStatusFirstUnusedEnumVal = static_cast<WiFiConnectionStatus>(2);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -866,6 +921,7 @@ enum class WiFiVersionType : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using WiFiVersionType                 = EmberAfWiFiVersionType;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static WiFiVersionType kWiFiVersionTypeFirstUnusedEnumVal = static_cast<WiFiVersionType>(6);
 } // namespace WiFiNetworkDiagnostics
 
 namespace EthernetNetworkDiagnostics {
@@ -890,6 +946,7 @@ enum class PHYRateType : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using PHYRateType                     = EmberAfPHYRateType;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static PHYRateType kPHYRateTypeFirstUnusedEnumVal = static_cast<PHYRateType>(10);
 } // namespace EthernetNetworkDiagnostics
 
 namespace TimeSynchronization {
@@ -910,6 +967,7 @@ enum class CommissioningWindowStatus : uint8_t
     kEnhancedWindowOpen = 0x01,
     kBasicWindowOpen    = 0x02,
 };
+static CommissioningWindowStatus kCommissioningWindowStatusFirstUnusedEnumVal = static_cast<CommissioningWindowStatus>(3);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -924,6 +982,7 @@ enum class StatusCode : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using StatusCode                      = EmberAfStatusCode;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static StatusCode kStatusCodeFirstUnusedEnumVal = static_cast<StatusCode>(0);
 } // namespace AdministratorCommissioning
 
 namespace OperationalCredentials {
@@ -943,6 +1002,7 @@ enum class OperationalCertStatus : uint8_t
     kLabelConflict         = 0x0A,
     kInvalidFabricIndex    = 0x0B,
 };
+static OperationalCertStatus kOperationalCertStatusFirstUnusedEnumVal = static_cast<OperationalCertStatus>(7);
 } // namespace OperationalCredentials
 
 namespace GroupKeyManagement {
@@ -953,6 +1013,7 @@ enum class GroupKeySecurityPolicy : uint8_t
     kTrustFirst   = 0x00,
     kCacheAndSync = 0x01,
 };
+static GroupKeySecurityPolicy kGroupKeySecurityPolicyFirstUnusedEnumVal = static_cast<GroupKeySecurityPolicy>(2);
 } // namespace GroupKeyManagement
 
 namespace FixedLabel {
@@ -999,6 +1060,7 @@ enum class DlAlarmCode : uint8_t
     kDoorAjar                = 0x07,
     kForcedUser              = 0x08,
 };
+static DlAlarmCode kDlAlarmCodeFirstUnusedEnumVal = static_cast<DlAlarmCode>(2);
 
 // Enum for DlCredentialRule
 enum class DlCredentialRule : uint8_t
@@ -1007,6 +1069,7 @@ enum class DlCredentialRule : uint8_t
     kDouble = 0x01,
     kTri    = 0x02,
 };
+static DlCredentialRule kDlCredentialRuleFirstUnusedEnumVal = static_cast<DlCredentialRule>(3);
 
 // Enum for DlCredentialType
 enum class DlCredentialType : uint8_t
@@ -1018,6 +1081,7 @@ enum class DlCredentialType : uint8_t
     kFingerVein     = 0x04,
     kFace           = 0x05,
 };
+static DlCredentialType kDlCredentialTypeFirstUnusedEnumVal = static_cast<DlCredentialType>(6);
 
 // Enum for DlDataOperationType
 enum class DlDataOperationType : uint8_t
@@ -1026,6 +1090,7 @@ enum class DlDataOperationType : uint8_t
     kClear  = 0x01,
     kModify = 0x02,
 };
+static DlDataOperationType kDlDataOperationTypeFirstUnusedEnumVal = static_cast<DlDataOperationType>(3);
 
 // Enum for DlDoorState
 enum class DlDoorState : uint8_t
@@ -1037,6 +1102,7 @@ enum class DlDoorState : uint8_t
     kDoorUnspecifiedError = 0x04,
     kDoorAjar             = 0x05,
 };
+static DlDoorState kDlDoorStateFirstUnusedEnumVal = static_cast<DlDoorState>(6);
 
 // Enum for DlLockDataType
 enum class DlLockDataType : uint8_t
@@ -1051,6 +1117,7 @@ enum class DlLockDataType : uint8_t
     kRfid            = 0x07,
     kFingerprint     = 0x08,
 };
+static DlLockDataType kDlLockDataTypeFirstUnusedEnumVal = static_cast<DlLockDataType>(9);
 
 // Enum for DlLockOperationType
 enum class DlLockOperationType : uint8_t
@@ -1060,6 +1127,7 @@ enum class DlLockOperationType : uint8_t
     kNonAccessUserEvent = 0x02,
     kForcedUserEvent    = 0x03,
 };
+static DlLockOperationType kDlLockOperationTypeFirstUnusedEnumVal = static_cast<DlLockOperationType>(4);
 
 // Enum for DlLockState
 enum class DlLockState : uint8_t
@@ -1068,6 +1136,7 @@ enum class DlLockState : uint8_t
     kLocked         = 0x01,
     kUnlocked       = 0x02,
 };
+static DlLockState kDlLockStateFirstUnusedEnumVal = static_cast<DlLockState>(3);
 
 // Enum for DlLockType
 enum class DlLockType : uint8_t
@@ -1084,6 +1153,7 @@ enum class DlLockType : uint8_t
     kDeadLatch          = 0x09,
     kDoorFurniture      = 0x0A,
 };
+static DlLockType kDlLockTypeFirstUnusedEnumVal = static_cast<DlLockType>(11);
 
 // Enum for DlOperatingMode
 enum class DlOperatingMode : uint8_t
@@ -1094,6 +1164,7 @@ enum class DlOperatingMode : uint8_t
     kNoRemoteLockUnlock = 0x03,
     kPassage            = 0x04,
 };
+static DlOperatingMode kDlOperatingModeFirstUnusedEnumVal = static_cast<DlOperatingMode>(5);
 
 // Enum for DlOperationError
 enum class DlOperationError : uint8_t
@@ -1104,6 +1175,7 @@ enum class DlOperationError : uint8_t
     kRestricted          = 0x03,
     kInsufficientBattery = 0x04,
 };
+static DlOperationError kDlOperationErrorFirstUnusedEnumVal = static_cast<DlOperationError>(5);
 
 // Enum for DlOperationSource
 enum class DlOperationSource : uint8_t
@@ -1119,6 +1191,7 @@ enum class DlOperationSource : uint8_t
     kRfid              = 0x08,
     kBiometric         = 0x09,
 };
+static DlOperationSource kDlOperationSourceFirstUnusedEnumVal = static_cast<DlOperationSource>(10);
 
 // Enum for DlStatus
 enum class DlStatus : uint8_t
@@ -1131,6 +1204,7 @@ enum class DlStatus : uint8_t
     kResourceExhausted = 0x89,
     kNotFound          = 0x8B,
 };
+static DlStatus kDlStatusFirstUnusedEnumVal = static_cast<DlStatus>(4);
 
 // Enum for DlUserStatus
 enum class DlUserStatus : uint8_t
@@ -1139,6 +1213,7 @@ enum class DlUserStatus : uint8_t
     kOccupiedEnabled  = 0x01,
     kOccupiedDisabled = 0x03,
 };
+static DlUserStatus kDlUserStatusFirstUnusedEnumVal = static_cast<DlUserStatus>(2);
 
 // Enum for DlUserType
 enum class DlUserType : uint8_t
@@ -1154,6 +1229,7 @@ enum class DlUserType : uint8_t
     kScheduleRestrictedUser = 0x08,
     kRemoteOnlyUser         = 0x09,
 };
+static DlUserType kDlUserTypeFirstUnusedEnumVal = static_cast<DlUserType>(10);
 
 // Enum for DoorLockOperationEventCode
 enum class DoorLockOperationEventCode : uint8_t
@@ -1174,6 +1250,7 @@ enum class DoorLockOperationEventCode : uint8_t
     kManualLock            = 0x0D,
     kManualUnlock          = 0x0E,
 };
+static DoorLockOperationEventCode kDoorLockOperationEventCodeFirstUnusedEnumVal = static_cast<DoorLockOperationEventCode>(15);
 
 // Enum for DoorLockProgrammingEventCode
 enum class DoorLockProgrammingEventCode : uint8_t
@@ -1186,6 +1263,7 @@ enum class DoorLockProgrammingEventCode : uint8_t
     kIdAdded              = 0x05,
     kIdDeleted            = 0x06,
 };
+static DoorLockProgrammingEventCode kDoorLockProgrammingEventCodeFirstUnusedEnumVal = static_cast<DoorLockProgrammingEventCode>(7);
 
 // Enum for DoorLockSetPinOrIdStatus
 enum class DoorLockSetPinOrIdStatus : uint8_t
@@ -1195,6 +1273,7 @@ enum class DoorLockSetPinOrIdStatus : uint8_t
     kMemoryFull         = 0x02,
     kDuplicateCodeError = 0x03,
 };
+static DoorLockSetPinOrIdStatus kDoorLockSetPinOrIdStatusFirstUnusedEnumVal = static_cast<DoorLockSetPinOrIdStatus>(4);
 
 // Enum for DoorLockUserStatus
 enum class DoorLockUserStatus : uint8_t
@@ -1204,6 +1283,7 @@ enum class DoorLockUserStatus : uint8_t
     kOccupiedDisabled = 0x03,
     kNotSupported     = 0xFF,
 };
+static DoorLockUserStatus kDoorLockUserStatusFirstUnusedEnumVal = static_cast<DoorLockUserStatus>(2);
 
 // Enum for DoorLockUserType
 enum class DoorLockUserType : uint8_t
@@ -1215,6 +1295,7 @@ enum class DoorLockUserType : uint8_t
     kNonAccessUser       = 0x04,
     kNotSupported        = 0xFF,
 };
+static DoorLockUserType kDoorLockUserTypeFirstUnusedEnumVal = static_cast<DoorLockUserType>(5);
 
 // Bitmap for DlCredentialRuleMask
 enum class DlCredentialRuleMask : uint8_t
@@ -1416,6 +1497,7 @@ enum class EndProductType : uint8_t
     kSlidingShutter            = 0x17,
     kUnknown                   = 0xFF,
 };
+static EndProductType kEndProductTypeFirstUnusedEnumVal = static_cast<EndProductType>(24);
 
 // Enum for Type
 enum class Type : uint8_t
@@ -1432,6 +1514,7 @@ enum class Type : uint8_t
     kProjectorScreen           = 0x09,
     kUnknown                   = 0xFF,
 };
+static Type kTypeFirstUnusedEnumVal = static_cast<Type>(10);
 
 // Bitmap for ConfigStatus
 enum class ConfigStatus : uint8_t
@@ -1505,6 +1588,7 @@ enum class PumpControlMode : uint8_t
     kConstantTemperature  = 0x05,
     kAutomatic            = 0x07,
 };
+static PumpControlMode kPumpControlModeFirstUnusedEnumVal = static_cast<PumpControlMode>(4);
 
 // Enum for PumpOperationMode
 enum class PumpOperationMode : uint8_t
@@ -1514,6 +1598,7 @@ enum class PumpOperationMode : uint8_t
     kMaximum = 0x02,
     kLocal   = 0x03,
 };
+static PumpOperationMode kPumpOperationModeFirstUnusedEnumVal = static_cast<PumpOperationMode>(4);
 
 // Bitmap for PumpStatus
 enum class PumpStatus : uint16_t
@@ -1545,6 +1630,7 @@ enum class SetpointAdjustMode : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using SetpointAdjustMode              = EmberAfSetpointAdjustMode;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static SetpointAdjustMode kSetpointAdjustModeFirstUnusedEnumVal = static_cast<SetpointAdjustMode>(3);
 
 // Enum for ThermostatControlSequence
 enum class ThermostatControlSequence : uint8_t
@@ -1556,6 +1642,7 @@ enum class ThermostatControlSequence : uint8_t
     kCoolingAndHeating           = 0x04,
     kCoolingAndHeatingWithReheat = 0x05,
 };
+static ThermostatControlSequence kThermostatControlSequenceFirstUnusedEnumVal = static_cast<ThermostatControlSequence>(6);
 
 // Enum for ThermostatRunningMode
 enum class ThermostatRunningMode : uint8_t
@@ -1564,6 +1651,7 @@ enum class ThermostatRunningMode : uint8_t
     kCool = 0x03,
     kHeat = 0x04,
 };
+static ThermostatRunningMode kThermostatRunningModeFirstUnusedEnumVal = static_cast<ThermostatRunningMode>(1);
 
 // Enum for ThermostatSystemMode
 enum class ThermostatSystemMode : uint8_t
@@ -1576,6 +1664,7 @@ enum class ThermostatSystemMode : uint8_t
     kPrecooling       = 0x06,
     kFanOnly          = 0x07,
 };
+static ThermostatSystemMode kThermostatSystemModeFirstUnusedEnumVal = static_cast<ThermostatSystemMode>(2);
 
 // Bitmap for DayOfWeek
 enum class DayOfWeek : uint8_t
@@ -1621,6 +1710,7 @@ enum class FanModeSequenceType : uint8_t
     kOffOnAuto         = 0x04,
     kOffOn             = 0x05,
 };
+static FanModeSequenceType kFanModeSequenceTypeFirstUnusedEnumVal = static_cast<FanModeSequenceType>(6);
 
 // Enum for FanModeType
 enum class FanModeType : uint8_t
@@ -1633,6 +1723,7 @@ enum class FanModeType : uint8_t
     kAuto   = 0x05,
     kSmart  = 0x06,
 };
+static FanModeType kFanModeTypeFirstUnusedEnumVal = static_cast<FanModeType>(7);
 
 // Bitmap for FanControlFeature
 enum class FanControlFeature : uint32_t
@@ -1687,6 +1778,7 @@ enum class ColorLoopAction : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using ColorLoopAction                 = EmberAfColorLoopAction;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static ColorLoopAction kColorLoopActionFirstUnusedEnumVal = static_cast<ColorLoopAction>(3);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1700,6 +1792,7 @@ enum class ColorLoopDirection : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using ColorLoopDirection              = EmberAfColorLoopDirection;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static ColorLoopDirection kColorLoopDirectionFirstUnusedEnumVal = static_cast<ColorLoopDirection>(2);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1714,6 +1807,7 @@ enum class ColorMode : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using ColorMode                       = EmberAfColorMode;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static ColorMode kColorModeFirstUnusedEnumVal = static_cast<ColorMode>(3);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1729,6 +1823,7 @@ enum class HueDirection : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using HueDirection                    = EmberAfHueDirection;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static HueDirection kHueDirectionFirstUnusedEnumVal = static_cast<HueDirection>(4);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1743,6 +1838,7 @@ enum class HueMoveMode : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using HueMoveMode                     = EmberAfHueMoveMode;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static HueMoveMode kHueMoveModeFirstUnusedEnumVal = static_cast<HueMoveMode>(2);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1756,6 +1852,7 @@ enum class HueStepMode : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using HueStepMode                     = EmberAfHueStepMode;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static HueStepMode kHueStepModeFirstUnusedEnumVal = static_cast<HueStepMode>(0);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1770,6 +1867,7 @@ enum class SaturationMoveMode : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using SaturationMoveMode              = EmberAfSaturationMoveMode;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static SaturationMoveMode kSaturationMoveModeFirstUnusedEnumVal = static_cast<SaturationMoveMode>(2);
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
@@ -1783,6 +1881,7 @@ enum class SaturationStepMode : uint8_t
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 using SaturationStepMode              = EmberAfSaturationStepMode;
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
+static SaturationStepMode kSaturationStepModeFirstUnusedEnumVal = static_cast<SaturationStepMode>(0);
 
 // Bitmap for ColorCapabilities
 enum class ColorCapabilities : uint16_t
@@ -1825,6 +1924,7 @@ enum class LightSensorType : uint8_t
     kPhotodiode = 0x00,
     kCmos       = 0x01,
 };
+static LightSensorType kLightSensorTypeFirstUnusedEnumVal = static_cast<LightSensorType>(2);
 } // namespace IlluminanceMeasurement
 
 namespace TemperatureMeasurement {
@@ -1950,12 +2050,14 @@ enum class ChannelStatusEnum : uint8_t
     kMultipleMatches = 0x01,
     kNoMatches       = 0x02,
 };
+static ChannelStatusEnum kChannelStatusEnumFirstUnusedEnumVal = static_cast<ChannelStatusEnum>(3);
 
 // Enum for LineupInfoTypeEnum
 enum class LineupInfoTypeEnum : uint8_t
 {
     kMso = 0x00,
 };
+static LineupInfoTypeEnum kLineupInfoTypeEnumFirstUnusedEnumVal = static_cast<LineupInfoTypeEnum>(1);
 
 // Bitmap for ChannelFeature
 enum class ChannelFeature : uint32_t
@@ -1974,6 +2076,7 @@ enum class TargetNavigatorStatusEnum : uint8_t
     kTargetNotFound = 0x01,
     kNotAllowed     = 0x02,
 };
+static TargetNavigatorStatusEnum kTargetNavigatorStatusEnumFirstUnusedEnumVal = static_cast<TargetNavigatorStatusEnum>(3);
 } // namespace TargetNavigator
 
 namespace MediaPlayback {
@@ -1988,6 +2091,7 @@ enum class MediaPlaybackStatusEnum : uint8_t
     kSpeedOutOfRange        = 0x04,
     kSeekOutOfRange         = 0x05,
 };
+static MediaPlaybackStatusEnum kMediaPlaybackStatusEnumFirstUnusedEnumVal = static_cast<MediaPlaybackStatusEnum>(6);
 
 // Enum for PlaybackStateEnum
 enum class PlaybackStateEnum : uint8_t
@@ -1997,6 +2101,7 @@ enum class PlaybackStateEnum : uint8_t
     kNotPlaying = 0x02,
     kBuffering  = 0x03,
 };
+static PlaybackStateEnum kPlaybackStateEnumFirstUnusedEnumVal = static_cast<PlaybackStateEnum>(4);
 } // namespace MediaPlayback
 
 namespace MediaInput {
@@ -2017,6 +2122,7 @@ enum class InputTypeEnum : uint8_t
     kUsb       = 0x0A,
     kOther     = 0x0B,
 };
+static InputTypeEnum kInputTypeEnumFirstUnusedEnumVal = static_cast<InputTypeEnum>(12);
 
 // Bitmap for MediaInputFeature
 enum class MediaInputFeature : uint32_t
@@ -2120,6 +2226,7 @@ enum class CecKeyCode : uint8_t
     kF5                        = 0x75,
     kData                      = 0x76,
 };
+static CecKeyCode kCecKeyCodeFirstUnusedEnumVal = static_cast<CecKeyCode>(14);
 
 // Enum for KeypadInputStatusEnum
 enum class KeypadInputStatusEnum : uint8_t
@@ -2128,6 +2235,7 @@ enum class KeypadInputStatusEnum : uint8_t
     kUnsupportedKey           = 0x01,
     kInvalidKeyInCurrentState = 0x02,
 };
+static KeypadInputStatusEnum kKeypadInputStatusEnumFirstUnusedEnumVal = static_cast<KeypadInputStatusEnum>(3);
 
 // Bitmap for KeypadInputFeature
 enum class KeypadInputFeature : uint32_t
@@ -2147,6 +2255,7 @@ enum class ContentLaunchStatusEnum : uint8_t
     kUrlNotAvailable = 0x01,
     kAuthFailed      = 0x02,
 };
+static ContentLaunchStatusEnum kContentLaunchStatusEnumFirstUnusedEnumVal = static_cast<ContentLaunchStatusEnum>(3);
 
 // Enum for MetricTypeEnum
 enum class MetricTypeEnum : uint8_t
@@ -2154,6 +2263,7 @@ enum class MetricTypeEnum : uint8_t
     kPixels     = 0x00,
     kPercentage = 0x01,
 };
+static MetricTypeEnum kMetricTypeEnumFirstUnusedEnumVal = static_cast<MetricTypeEnum>(2);
 
 // Enum for ParameterEnum
 enum class ParameterEnum : uint8_t
@@ -2172,6 +2282,7 @@ enum class ParameterEnum : uint8_t
     kSportsTeam = 0x0B,
     kType       = 0x0C,
 };
+static ParameterEnum kParameterEnumFirstUnusedEnumVal = static_cast<ParameterEnum>(13);
 
 // Bitmap for ContentLauncherFeature
 enum class ContentLauncherFeature : uint32_t
@@ -2200,6 +2311,7 @@ enum class OutputTypeEnum : uint8_t
     kInternal  = 0x04,
     kOther     = 0x05,
 };
+static OutputTypeEnum kOutputTypeEnumFirstUnusedEnumVal = static_cast<OutputTypeEnum>(6);
 
 // Bitmap for AudioOutputFeature
 enum class AudioOutputFeature : uint32_t
@@ -2217,6 +2329,8 @@ enum class ApplicationLauncherStatusEnum : uint8_t
     kAppNotAvailable = 0x01,
     kSystemBusy      = 0x02,
 };
+static ApplicationLauncherStatusEnum kApplicationLauncherStatusEnumFirstUnusedEnumVal =
+    static_cast<ApplicationLauncherStatusEnum>(3);
 
 // Bitmap for ApplicationLauncherFeature
 enum class ApplicationLauncherFeature : uint32_t
@@ -2235,6 +2349,7 @@ enum class ApplicationStatusEnum : uint8_t
     kActiveHidden          = 0x02,
     kActiveVisibleNotFocus = 0x03,
 };
+static ApplicationStatusEnum kApplicationStatusEnumFirstUnusedEnumVal = static_cast<ApplicationStatusEnum>(4);
 } // namespace ApplicationBasic
 
 namespace AccountLogin {
@@ -2327,6 +2442,7 @@ enum class EventId : uint8_t
     kManufacturerSpecificH              = 0xE7,
     kManufacturerSpecificI              = 0xE8,
 };
+static EventId kEventIdFirstUnusedEnumVal = static_cast<EventId>(49);
 
 // Enum for MessagingControlConfirmation
 enum class MessagingControlConfirmation : uint8_t
@@ -2334,6 +2450,7 @@ enum class MessagingControlConfirmation : uint8_t
     kNotRequired = 0x00,
     kRequired    = 0x80,
 };
+static MessagingControlConfirmation kMessagingControlConfirmationFirstUnusedEnumVal = static_cast<MessagingControlConfirmation>(1);
 
 // Enum for MessagingControlEnhancedConfirmation
 enum class MessagingControlEnhancedConfirmation : uint8_t
@@ -2341,6 +2458,8 @@ enum class MessagingControlEnhancedConfirmation : uint8_t
     kNotRequired = 0x00,
     kRequired    = 0x20,
 };
+static MessagingControlEnhancedConfirmation kMessagingControlEnhancedConfirmationFirstUnusedEnumVal =
+    static_cast<MessagingControlEnhancedConfirmation>(1);
 
 // Enum for MessagingControlImportance
 enum class MessagingControlImportance : uint8_t
@@ -2350,6 +2469,7 @@ enum class MessagingControlImportance : uint8_t
     kHigh     = 0x08,
     kCritical = 0x0C,
 };
+static MessagingControlImportance kMessagingControlImportanceFirstUnusedEnumVal = static_cast<MessagingControlImportance>(1);
 
 // Enum for MessagingControlTransmission
 enum class MessagingControlTransmission : uint8_t
@@ -2359,6 +2479,7 @@ enum class MessagingControlTransmission : uint8_t
     kAnonymous          = 0x02,
     kReserved           = 0x03,
 };
+static MessagingControlTransmission kMessagingControlTransmissionFirstUnusedEnumVal = static_cast<MessagingControlTransmission>(4);
 
 // Bitmap for MessagingConfirmationControl
 enum class MessagingConfirmationControl : uint8_t
@@ -2400,6 +2521,7 @@ enum class EventIdentification : uint8_t
     kSwitchingOff       = 0x06,
     kWrongData          = 0x07,
 };
+static EventIdentification kEventIdentificationFirstUnusedEnumVal = static_cast<EventIdentification>(0);
 
 // Bitmap for AlertCount
 enum class AlertCount : uint8_t
@@ -2433,6 +2555,7 @@ enum class SimpleEnum : uint8_t
     kValueB      = 0x02,
     kValueC      = 0x03,
 };
+static SimpleEnum kSimpleEnumFirstUnusedEnumVal = static_cast<SimpleEnum>(4);
 
 // Bitmap for Bitmap16MaskMap
 enum class Bitmap16MaskMap : uint16_t
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 3df060d0aec5e6..3741faa749524a 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -39061,7 +39061,7 @@ class TestClusterSuite : public TestCommand
 
     chip::app::DataModel::Nullable<bool> booValueNull;
     chip::app::DataModel::Nullable<chip::BitMask<chip::app::Clusters::TestCluster::Bitmap8MaskMap>> nullableValue254;
-    chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> nullableEnumAttr4;
+    chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> nullableEnumAttr3;
     uint8_t * nullableOctetStrTestValueBuffer = nullptr;
     chip::app::DataModel::Nullable<chip::ByteSpan> nullableOctetStrTestValue;
     char * nullableCharStringSaveBuffer = nullptr;
@@ -41486,8 +41486,8 @@ class TestClusterSuite : public TestCommand
                 chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("nullableEnumAttr", value));
-                VerifyOrReturn(CheckValue("nullableEnumAttr.Value()", value.Value(), 4U));
-                nullableEnumAttr4 = value;
+                VerifyOrReturn(CheckValue("nullableEnumAttr.Value()", value.Value(), 3U));
+                nullableEnumAttr3 = value;
             }
             break;
         case 351:
@@ -41506,7 +41506,7 @@ class TestClusterSuite : public TestCommand
             {
                 chip::app::DataModel::Nullable<chip::app::Clusters::TestCluster::SimpleEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintNotValue("value", value, nullableEnumAttr4));
+                VerifyOrReturn(CheckConstraintNotValue("value", value, nullableEnumAttr3));
             }
             break;
         case 354:
@@ -45324,7 +45324,7 @@ class TestClusterSuite : public TestCommand
                                  true, chip::NullOptional);
         }
         case 353: {
-            LogStep(353, "Read attribute NULLABLE_SIMPLE_ENUM not 254 Value");
+            LogStep(353, "Read attribute NULLABLE_SIMPLE_ENUM not 3 Value");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::NullableEnumAttr::Id,
                                  true, chip::NullOptional);
         }
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index 4b6ef09dc18569..c0cf9bd7a62e1b 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -64873,8 +64873,8 @@ class TestCluster : public TestCommandBridge {
             err = TestReadAttributeNullableSimpleEnumNullValue_352();
             break;
         case 353:
-            ChipLogProgress(chipTool, " ***** Test Step 353 : Read attribute NULLABLE_SIMPLE_ENUM not 254 Value\n");
-            err = TestReadAttributeNullableSimpleEnumNot254Value_353();
+            ChipLogProgress(chipTool, " ***** Test Step 353 : Read attribute NULLABLE_SIMPLE_ENUM not 3 Value\n");
+            err = TestReadAttributeNullableSimpleEnumNot3Value_353();
             break;
         case 354:
             ChipLogProgress(chipTool, " ***** Test Step 354 : Read attribute NULLABLE_OCTET_STRING Default Value\n");
@@ -75955,7 +75955,7 @@ class TestCluster : public TestCommandBridge {
 
         return CHIP_NO_ERROR;
     }
-    NSNumber * _Nullable nullableEnumAttr4;
+    NSNumber * _Nullable nullableEnumAttr3;
 
     CHIP_ERROR TestReadAttributeNullableSimpleEnumUnchangedValue_350()
     {
@@ -75973,10 +75973,10 @@ class TestCluster : public TestCommandBridge {
             {
                 id actualValue = value;
                 VerifyOrReturn(CheckValueNonNull("nullable_enum_attr", actualValue));
-                VerifyOrReturn(CheckValue("nullable_enum_attr", actualValue, 4U));
+                VerifyOrReturn(CheckValue("nullable_enum_attr", actualValue, 3U));
             }
             {
-                nullableEnumAttr4 = value;
+                nullableEnumAttr3 = value;
             }
 
             NextTest();
@@ -76031,7 +76031,7 @@ class TestCluster : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadAttributeNullableSimpleEnumNot254Value_353()
+    CHIP_ERROR TestReadAttributeNullableSimpleEnumNot3Value_353()
     {
         MTRBaseDevice * device = GetDevice("alpha");
         MTRBaseClusterTestCluster * cluster = [[MTRBaseClusterTestCluster alloc] initWithDevice:device
@@ -76040,13 +76040,13 @@ class TestCluster : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeNullableEnumAttrWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM not 254 Value Error: %@", err);
+            NSLog(@"Read attribute NULLABLE_SIMPLE_ENUM not 3 Value Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             if (value != nil) {
             }
-            VerifyOrReturn(CheckConstraintNotValue("nullableEnumAttr", value, nullableEnumAttr4));
+            VerifyOrReturn(CheckConstraintNotValue("nullableEnumAttr", value, nullableEnumAttr3));
 
             NextTest();
         }];