diff --git a/redfish-core/include/generated/enums/account_service.hpp b/redfish-core/include/generated/enums/account_service.hpp
index e06b5f2..761e681 100644
--- a/redfish-core/include/generated/enums/account_service.hpp
+++ b/redfish-core/include/generated/enums/account_service.hpp
@@ -13,6 +13,7 @@
     MicrosoftAuthenticator,
     ClientCertificate,
     OneTimePasscode,
+    TimeBasedOneTimePassword,
     OEM,
 };
 
@@ -79,6 +80,7 @@
     {MFABypassType::MicrosoftAuthenticator, "MicrosoftAuthenticator"},
     {MFABypassType::ClientCertificate, "ClientCertificate"},
     {MFABypassType::OneTimePasscode, "OneTimePasscode"},
+    {MFABypassType::TimeBasedOneTimePassword, "TimeBasedOneTimePassword"},
     {MFABypassType::OEM, "OEM"},
 });
 
diff --git a/redfish-core/include/generated/enums/certificate.hpp b/redfish-core/include/generated/enums/certificate.hpp
index d647bc5..45094b4 100644
--- a/redfish-core/include/generated/enums/certificate.hpp
+++ b/redfish-core/include/generated/enums/certificate.hpp
@@ -43,6 +43,7 @@
     LDevID,
     IAK,
     LAK,
+    EK,
 };
 
 NLOHMANN_JSON_SERIALIZE_ENUM(CertificateType, {
@@ -83,6 +84,7 @@
     {CertificateUsageType::LDevID, "LDevID"},
     {CertificateUsageType::IAK, "IAK"},
     {CertificateUsageType::LAK, "LAK"},
+    {CertificateUsageType::EK, "EK"},
 });
 
 }
diff --git a/redfish-core/include/generated/enums/component_integrity.hpp b/redfish-core/include/generated/enums/component_integrity.hpp
index 433b195..26ed422 100644
--- a/redfish-core/include/generated/enums/component_integrity.hpp
+++ b/redfish-core/include/generated/enums/component_integrity.hpp
@@ -9,6 +9,8 @@
     Invalid,
     SPDM,
     TPM,
+    TCM,
+    TPCM,
     OEM,
 };
 
@@ -51,6 +53,8 @@
     {ComponentIntegrityType::Invalid, "Invalid"},
     {ComponentIntegrityType::SPDM, "SPDM"},
     {ComponentIntegrityType::TPM, "TPM"},
+    {ComponentIntegrityType::TCM, "TCM"},
+    {ComponentIntegrityType::TPCM, "TPCM"},
     {ComponentIntegrityType::OEM, "OEM"},
 });
 
diff --git a/redfish-core/include/generated/enums/computer_system.hpp b/redfish-core/include/generated/enums/computer_system.hpp
index cb053af..9c04c3a 100644
--- a/redfish-core/include/generated/enums/computer_system.hpp
+++ b/redfish-core/include/generated/enums/computer_system.hpp
@@ -198,6 +198,20 @@
     Logs,
 };
 
+enum class LastResetCauses{
+    Invalid,
+    PowerButtonPress,
+    ManagementCommand,
+    PowerRestorePolicy,
+    RTCWakeup,
+    WatchdogExpiration,
+    OSSoftRestart,
+    SystemCrash,
+    ThermalEvent,
+    PowerEvent,
+    Unknown,
+};
+
 NLOHMANN_JSON_SERIALIZE_ENUM(BootSource, {
     {BootSource::Invalid, "Invalid"},
     {BootSource::None, "None"},
@@ -391,5 +405,19 @@
     {DecommissionType::Logs, "Logs"},
 });
 
+NLOHMANN_JSON_SERIALIZE_ENUM(LastResetCauses, {
+    {LastResetCauses::Invalid, "Invalid"},
+    {LastResetCauses::PowerButtonPress, "PowerButtonPress"},
+    {LastResetCauses::ManagementCommand, "ManagementCommand"},
+    {LastResetCauses::PowerRestorePolicy, "PowerRestorePolicy"},
+    {LastResetCauses::RTCWakeup, "RTCWakeup"},
+    {LastResetCauses::WatchdogExpiration, "WatchdogExpiration"},
+    {LastResetCauses::OSSoftRestart, "OSSoftRestart"},
+    {LastResetCauses::SystemCrash, "SystemCrash"},
+    {LastResetCauses::ThermalEvent, "ThermalEvent"},
+    {LastResetCauses::PowerEvent, "PowerEvent"},
+    {LastResetCauses::Unknown, "Unknown"},
+});
+
 }
 // clang-format on
diff --git a/redfish-core/include/generated/enums/pcie_device.hpp b/redfish-core/include/generated/enums/pcie_device.hpp
index 209d003..cd2016f 100644
--- a/redfish-core/include/generated/enums/pcie_device.hpp
+++ b/redfish-core/include/generated/enums/pcie_device.hpp
@@ -12,6 +12,7 @@
     Gen3,
     Gen4,
     Gen5,
+    Gen6,
 };
 
 enum class DeviceType{
@@ -64,6 +65,7 @@
     {PCIeTypes::Gen3, "Gen3"},
     {PCIeTypes::Gen4, "Gen4"},
     {PCIeTypes::Gen5, "Gen5"},
+    {PCIeTypes::Gen6, "Gen6"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(DeviceType, {
diff --git a/redfish-core/include/generated/enums/physical_context.hpp b/redfish-core/include/generated/enums/physical_context.hpp
index 8ec14c2..876e62c 100644
--- a/redfish-core/include/generated/enums/physical_context.hpp
+++ b/redfish-core/include/generated/enums/physical_context.hpp
@@ -30,7 +30,9 @@
     VoltageRegulator,
     Rectifier,
     StorageDevice,
+    StorageSubsystem,
     NetworkingDevice,
+    ExpansionSubsystem,
     ComputeBay,
     StorageBay,
     NetworkBay,
@@ -49,6 +51,7 @@
     DCBus,
     ACOutput,
     ACInput,
+    PowerOutlet,
     TrustedModule,
     Board,
     Transceiver,
@@ -101,7 +104,9 @@
     {PhysicalContext::VoltageRegulator, "VoltageRegulator"},
     {PhysicalContext::Rectifier, "Rectifier"},
     {PhysicalContext::StorageDevice, "StorageDevice"},
+    {PhysicalContext::StorageSubsystem, "StorageSubsystem"},
     {PhysicalContext::NetworkingDevice, "NetworkingDevice"},
+    {PhysicalContext::ExpansionSubsystem, "ExpansionSubsystem"},
     {PhysicalContext::ComputeBay, "ComputeBay"},
     {PhysicalContext::StorageBay, "StorageBay"},
     {PhysicalContext::NetworkBay, "NetworkBay"},
@@ -120,6 +125,7 @@
     {PhysicalContext::DCBus, "DCBus"},
     {PhysicalContext::ACOutput, "ACOutput"},
     {PhysicalContext::ACInput, "ACInput"},
+    {PhysicalContext::PowerOutlet, "PowerOutlet"},
     {PhysicalContext::TrustedModule, "TrustedModule"},
     {PhysicalContext::Board, "Board"},
     {PhysicalContext::Transceiver, "Transceiver"},
diff --git a/redfish-core/schema/dmtf/csdl/AccountService_v1.xml b/redfish-core/schema/dmtf/csdl/AccountService_v1.xml
index 14a56ce..ab0450c 100644
--- a/redfish-core/schema/dmtf/csdl/AccountService_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/AccountService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  AccountService v1.15.1                                              -->
+<!--# Redfish Schema:  AccountService v1.16.0                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -107,23 +107,23 @@
         </Member>
         <Member Name="SecurID">
           <Annotation Term="OData.Description" String="Bypass RSA SecurID."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass RSA SecurID."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass RSA SecurID.  Authentication with RSA SecurID is configured with the `SecurID` property."/>
         </Member>
         <Member Name="GoogleAuthenticator">
           <Annotation Term="OData.Description" String="Bypass Google Authenticator."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass Google Authenticator."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass Google Authenticator.  Authentication with Google Authenticator is configured with the `GoogleAuthenticator` property."/>
         </Member>
         <Member Name="MicrosoftAuthenticator">
           <Annotation Term="OData.Description" String="Bypass Microsoft Authenticator."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass Microsoft Authenticator."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass Microsoft Authenticator.  Authentication with Microsoft Authenticator is configured with the `MicrosoftAuthenticator` property."/>
         </Member>
         <Member Name="ClientCertificate">
           <Annotation Term="OData.Description" String="Bypass client certificate authentication."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass client certificate authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass client certificate authentication.  Authentication with client certificates is configured with the `ClientCertificate` property."/>
         </Member>
         <Member Name="OneTimePasscode">
           <Annotation Term="OData.Description" String="Bypass one-time passcode authentication."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass one-time passcode authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass one-time passcode authentication.  Authentication with a one-time passcode is configured with the `OneTimePasscode` property."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -133,6 +133,18 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="TimeBasedOneTimePassword">
+          <Annotation Term="OData.Description" String="Bypass Time-based One-Time Password (TOTP) authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass RFC6238-defined Time-based One-Time Password (TOTP) authentication.  Authentication with a Time-based One-Time Password is configured with the `TimeBasedOneTimePassword` property."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_16_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
         <Member Name="OEM">
           <Annotation Term="OData.Description" String="Bypass OEM-defined multi-factor authentication."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate an account or role mapping can bypass OEM-defined multi-factor authentication."/>
@@ -1508,11 +1520,11 @@
           <Annotation Term="OData.LongDescription" String="This property shall contain the settings related to RSA SecurID multi-factor authentication."/>
         </Property>
         <Property Name="GoogleAuthenticator" Type="AccountService.v1_12_0.GoogleAuthenticator">
-          <Annotation Term="OData.Description" String="The settings related to Google Authenticator multi-factor authentication."/>
+          <Annotation Term="OData.Description" String="The settings related to Google Authenticator multi-factor authentication.  For generic Time-Based One-Time Password (TOTP) multi-factor authentication, use the `TimeBasedOneTimePassword` property."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the settings related to Google Authenticator multi-factor authentication."/>
         </Property>
         <Property Name="MicrosoftAuthenticator" Type="AccountService.v1_12_0.MicrosoftAuthenticator">
-          <Annotation Term="OData.Description" String="The settings related to Microsoft Authenticator multi-factor authentication."/>
+          <Annotation Term="OData.Description" String="The settings related to Microsoft Authenticator multi-factor authentication.  For generic Time-Based One-Time Password (TOTP) multi-factor authentication, use the `TimeBasedOneTimePassword` property."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the settings related to Microsoft Authenticator multi-factor authentication."/>
         </Property>
         <Property Name="ClientCertificate" Type="AccountService.v1_12_0.ClientCertificate">
@@ -1755,6 +1767,7 @@
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_14_0">
       <Annotation Term="Redfish.Release" String="2023.2"/>
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add `OneTimePasscode` to `BypassTypes` for multi-factor authentication configurations."/>
 
       <EntityType Name="AccountService" BaseType="AccountService.v1_13_1.AccountService">
         <Property Name="RequireChangePasswordAction" Type="Edm.Boolean">
@@ -1841,5 +1854,50 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_15_0.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_16_0">
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add `TimeBasedOneTimePassword` to `BypassTypes` for multi-factor authentication configurations."/>
+
+      <EntityType Name="AccountService" BaseType="AccountService.v1_15_1.AccountService"/>
+
+      <ComplexType Name="RoleMapping" BaseType="AccountService.v1_12_0.RoleMapping">
+        <Property Name="LocalAccountTypes" Type="Collection(ManagerAccount.AccountTypes)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The list of local services in the manager that the remote user or group is allowed to access."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the various local manager services that the remote user or group is allowed to access.  This shall not include functionality for receiving events or other notifications.  If this property is not supported, the value shall be assumed to be an array that contains the value `Redfish`."/>
+        </Property>
+        <Property Name="LocalOEMAccountTypes" Type="Collection(Edm.String)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The OEM account types for the remote user or group."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the OEM account types for the remote user or group when `LocalAccountTypes` contains `OEM`."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="MultiFactorAuth" BaseType="AccountService.v1_14_0.MultiFactorAuth">
+        <Property Name="TimeBasedOneTimePassword" Type="AccountService.v1_16_0.TimeBasedOneTimePassword">
+          <Annotation Term="OData.Description" String="The settings related to Time-based One-Time Password (TOTP) multi-factor authentication."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the settings related to RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="TimeBasedOneTimePassword">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="Various settings for Time-based One-Time Password (TOTP) multi-factor authentication."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain settings for RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication."/>
+        <Property Name="Enabled" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="An indication of whether multi-factor authentication with a Time-based One-Time Password (TOTP) is enabled."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether multi-factor authentication with an RFC6238-defined Time-based One-Time Password (TOTP) is enabled."/>
+        </Property>
+        <Property Name="TimeStepSeconds" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The time step, in seconds, for calculating the one-time password."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the RFC6238-defined time step, in seconds, for calculating the one-time password.  If this property is not supported by the service, it shall be assumed to be `30`."/>
+          <Annotation Term="Validation.Minimum" Int="1"/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml b/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
index a7d82ad..4a58396 100644
--- a/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  AggregationSource v1.4.2                                            -->
+<!--# Redfish Schema:  AggregationSource v1.4.3                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -214,8 +214,8 @@
         <Property Name="AuthenticationKey" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Write"/>
           <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark."/>
-          <Annotation Term="Validation.Pattern" String="(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\*+$)"/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414."/>
+          <Annotation Term="Validation.Pattern" String="(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{24,96}$)|(^\*+$)"/>
         </Property>
         <Property Name="AuthenticationProtocol" Type="AggregationSource.v1_1_0.SNMPAuthenticationProtocols">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -225,8 +225,8 @@
         <Property Name="EncryptionKey" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Write"/>
           <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark."/>
-          <Annotation Term="Validation.Pattern" String="(^[A-Za-z0-9]+$)|(^\*+$)"/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414."/>
+          <Annotation Term="Validation.Pattern" String="(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{16,64}$)|(^\*+$)"/>
         </Property>
         <Property Name="EncryptionProtocol" Type="AggregationSource.v1_1_0.SNMPEncryptionProtocols">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -344,6 +344,12 @@
       <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_1_3.AggregationSource"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_1_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_1_4.AggregationSource"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.3"/>
@@ -400,6 +406,12 @@
       <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_2_3.AggregationSource"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_2_4.AggregationSource"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -482,6 +494,12 @@
       <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_3_3.AggregationSource"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_3_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_3_4.AggregationSource"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -502,5 +520,11 @@
       <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_4_1.AggregationSource"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_4_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_4_2.AggregationSource"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/CXLLogicalDevice_v1.xml b/redfish-core/schema/dmtf/csdl/CXLLogicalDevice_v1.xml
index 4686e7a..f1a13d1 100644
--- a/redfish-core/schema/dmtf/csdl/CXLLogicalDevice_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/CXLLogicalDevice_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  CXLLogicalDevice v1.2.0                                             -->
+<!--# Redfish Schema:  CXLLogicalDevice v1.2.1                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -108,8 +108,8 @@
         </Property>
         <Property Name="MemorySizeMiB" Type="Edm.Int64" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The memory region size defined in this CXL logical device."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the memory region size defined in this CXL logical device in mebibytes (MiB)."/>
+          <Annotation Term="OData.Description" String="The total memory capacity currently available in this CXL logical device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total memory capacity currently available in this CXL logical device in mebibytes (MiB).  This value shall equate to the sum of the dynamic capacity extents and the static capacity assigned to this logical device."/>
           <Annotation Term="Measures.Unit" String="MiBy"/>
         </Property>
         <Property Name="QoSTelemetryCapabilities" Type="CXLLogicalDevice.v1_0_0.QoSTelemetryCapabilities" Nullable="false">
@@ -254,6 +254,12 @@
       <EntityType Name="CXLLogicalDevice" BaseType="CXLLogicalDevice.v1_0_2.CXLLogicalDevice"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CXLLogicalDevice.v1_0_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of `MemorySizeMiB`."/>
+      <EntityType Name="CXLLogicalDevice" BaseType="CXLLogicalDevice.v1_0_3.CXLLogicalDevice"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CXLLogicalDevice.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -280,6 +286,12 @@
       <EntityType Name="CXLLogicalDevice" BaseType="CXLLogicalDevice.v1_1_1.CXLLogicalDevice"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CXLLogicalDevice.v1_1_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of `MemorySizeMiB`."/>
+      <EntityType Name="CXLLogicalDevice" BaseType="CXLLogicalDevice.v1_1_2.CXLLogicalDevice"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CXLLogicalDevice.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -288,5 +300,11 @@
       <EntityType Name="CXLLogicalDevice" BaseType="CXLLogicalDevice.v1_1_2.CXLLogicalDevice"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CXLLogicalDevice.v1_2_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of `MemorySizeMiB`."/>
+      <EntityType Name="CXLLogicalDevice" BaseType="CXLLogicalDevice.v1_2_0.CXLLogicalDevice"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Certificate_v1.xml b/redfish-core/schema/dmtf/csdl/Certificate_v1.xml
index 371c385..7058585 100644
--- a/redfish-core/schema/dmtf/csdl/Certificate_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Certificate_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Certificate v1.8.2                                                  -->
+<!--# Redfish Schema:  Certificate v1.9.0                                                  -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -705,6 +705,17 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="EK">
+          <Annotation Term="OData.Description" String="This certificate is an EK certificate like those associated with TCG TPMs."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_9_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
     </Schema>
 
@@ -886,5 +897,13 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_8_2.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_9_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+      <Annotation Term="OData.Description" String="This version was created to add the value `EK` to `CertificateUsageType` to support TCG TPM certificates."/>
+
+      <EntityType Name="Certificate" BaseType="Certificate.v1_8_3.Certificate"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Chassis_v1.xml b/redfish-core/schema/dmtf/csdl/Chassis_v1.xml
index a319354..a8a64ef 100644
--- a/redfish-core/schema/dmtf/csdl/Chassis_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Chassis_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Chassis v1.25.1                                                     -->
+<!--# Redfish Schema:  Chassis v1.25.2                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -2012,7 +2012,7 @@
         <NavigationProperty Name="EnvironmentMetrics" Type="EnvironmentMetrics.EnvironmentMetrics" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The link to the environment metrics for this chassis."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `EnvironmentMetrics` that specifies the environment metrics for this chassis."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `EnvironmentMetrics` that specifies the environment metrics for this chassis, all containing chassis, and devices contained by any of these chassis instances.  When determining power and energy readings, care should be taken to ensure any reported values do not overlap or result in double-counting."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
         <NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
@@ -2073,6 +2073,12 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_15_5.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_15_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the scope of the metrics in the subordinate `EnvironmentMetrics` resource."/>
+      <EntityType Name="Chassis" BaseType="Chassis.v1_15_6.Chassis"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_16_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -2117,6 +2123,12 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_16_4.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_16_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the scope of the metrics in the subordinate `EnvironmentMetrics` resource."/>
+      <EntityType Name="Chassis" BaseType="Chassis.v1_16_5.Chassis"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_17_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -2170,6 +2182,12 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_17_4.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_17_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the scope of the metrics in the subordinate `EnvironmentMetrics` resource."/>
+      <EntityType Name="Chassis" BaseType="Chassis.v1_17_5.Chassis"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_18_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.3"/>
@@ -2228,6 +2246,12 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_18_4.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_18_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the scope of the metrics in the subordinate `EnvironmentMetrics` resource."/>
+      <EntityType Name="Chassis" BaseType="Chassis.v1_18_5.Chassis"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_19_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -2266,6 +2290,12 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_19_4.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_19_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the scope of the metrics in the subordinate `EnvironmentMetrics` resource."/>
+      <EntityType Name="Chassis" BaseType="Chassis.v1_19_5.Chassis"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_20_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -2360,6 +2390,12 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_20_3.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_20_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the scope of the metrics in the subordinate `EnvironmentMetrics` resource."/>
+      <EntityType Name="Chassis" BaseType="Chassis.v1_20_4.Chassis"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_21_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -2413,6 +2449,12 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_21_3.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_21_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the scope of the metrics in the subordinate `EnvironmentMetrics` resource."/>
+      <EntityType Name="Chassis" BaseType="Chassis.v1_21_4.Chassis"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_22_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -2446,6 +2488,12 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_22_2.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_22_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the scope of the metrics in the subordinate `EnvironmentMetrics` resource."/>
+      <EntityType Name="Chassis" BaseType="Chassis.v1_22_3.Chassis"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_23_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -2481,6 +2529,12 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_23_1.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_23_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the scope of the metrics in the subordinate `EnvironmentMetrics` resource."/>
+      <EntityType Name="Chassis" BaseType="Chassis.v1_23_2.Chassis"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_24_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -2560,6 +2614,12 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_24_1.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_24_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the scope of the metrics in the subordinate `EnvironmentMetrics` resource."/>
+      <EntityType Name="Chassis" BaseType="Chassis.v1_24_2.Chassis"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_25_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -2586,5 +2646,11 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_25_0.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_25_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the scope of the metrics in the subordinate `EnvironmentMetrics` resource."/>
+      <EntityType Name="Chassis" BaseType="Chassis.v1_25_1.Chassis"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ComponentIntegrity_v1.xml b/redfish-core/schema/dmtf/csdl/ComponentIntegrity_v1.xml
index f8a96d4..14d7068 100644
--- a/redfish-core/schema/dmtf/csdl/ComponentIntegrity_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ComponentIntegrity_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ComponentIntegrity v1.2.3                                           -->
+<!--# Redfish Schema:  ComponentIntegrity v1.3.0                                           -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -194,6 +194,30 @@
           <Annotation Term="OData.Description" String="Trusted Platform Module (TPM)."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate the integrity information is related to a Trusted Platform Module (TPM) as defined by the Trusted Computing Group (TCG)."/>
         </Member>
+        <Member Name="TCM">
+          <Annotation Term="OData.Description" String="Trusted Cryptography Module (TCM)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the integrity information is related to a Trusted Cryptography Module (TCM) as defined by the China TCM Union (TCMU)."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_3_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="TPCM">
+          <Annotation Term="OData.Description" String="Trusted Platform Control Module (TPCM)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the integrity information is related to a Trusted Platform Control Module (TPCM) as defined by the Zhongguancun Trusted Computing Industry Alliance (ZTCIA)."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_3_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
         <Member Name="OEM">
           <Annotation Term="OData.Description" String="OEM-specific."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate the integrity information is OEM-specific and the OEM section may include additional information."/>
@@ -659,5 +683,13 @@
       <EntityType Name="ComponentIntegrity" BaseType="ComponentIntegrity.v1_2_2.ComponentIntegrity"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComponentIntegrity.v1_3_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+      <Annotation Term="OData.Description" String="This version was created to add `TCM` and `TPCM` to `ComponentIntegrityType`."/>
+
+      <EntityType Name="ComponentIntegrity" BaseType="ComponentIntegrity.v1_2_3.ComponentIntegrity"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml b/redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml
index 82705cc..ec9bd25 100644
--- a/redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ComputerSystem v1.22.2                                              -->
+<!--# Redfish Schema:  ComputerSystem v1.23.0                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -833,6 +833,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_0_22.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_0_24">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_0_23.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.1"/>
@@ -1080,6 +1086,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_1_20.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_1_22">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_1_21.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -1317,6 +1329,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_2_19.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_2_21">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_2_20.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.3"/>
@@ -1475,6 +1493,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_3_18.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_3_20">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_3_19.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -1609,6 +1633,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_4_17.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_4_19">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_4_18.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -1849,6 +1879,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_5_16.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_5_18">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_5_17.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -1988,6 +2024,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_6_14.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_6_16">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_6_15.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -2096,6 +2138,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_7_13.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_7_15">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_7_14.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -2189,6 +2237,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_8_12.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_8_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_8_13.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -2283,6 +2337,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_9_12.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_9_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_9_13.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -2370,6 +2430,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_10_11.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_10_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_10_12.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -2478,10 +2544,15 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_11_10.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_11_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_11_11.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
-      <Annotation Term="OData.Description" String="This version was created to add LastResetTime."/>
 
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_11_1.ComputerSystem">
         <Property Name="LastResetTime" Type="Edm.DateTimeOffset" Nullable="false">
@@ -2552,6 +2623,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_12_9.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_12_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_12_10.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -2847,6 +2924,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_13_8.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_13_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_13_9.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_14_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -2950,6 +3033,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_14_7.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_14_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_14_8.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_15_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -3096,6 +3185,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_15_6.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_15_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_15_7.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_16_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -3242,6 +3337,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_16_7.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_16_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_16_8.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_17_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -3301,6 +3402,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_17_6.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_17_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_17_7.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_18_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -3383,6 +3490,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_18_5.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_18_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_18_6.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_19_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -3436,6 +3549,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_19_5.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_19_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_19_6.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_20_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -3495,6 +3614,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_20_4.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_20_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_20_5.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_21_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -3574,6 +3699,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_21_2.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_21_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_21_3.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_22_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -3594,5 +3725,67 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_22_1.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_22_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_22_2.ComputerSystem"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_23_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_22_3.ComputerSystem">
+        <Property Name="LastResetCause" Type="ComputerSystem.v1_23_0.LastResetCauses" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The last reset cause of the system."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the cause when the system last came out of a reset or was rebooted."/>
+        </Property>
+      </EntityType>
+
+      <EnumType Name="LastResetCauses">
+        <Member Name="PowerButtonPress">
+          <Annotation Term="OData.Description" String="System start or restart via a power button press."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the system start or restart was due to a power button press."/>
+        </Member>
+        <Member Name="ManagementCommand">
+          <Annotation Term="OData.Description" String="System start or restart via an external command to the management controller or BMC."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the system start or restart was due to an external command to the management controller or BMC.  Examples include the Redfish `Reset` action for the `ComputerSystem` resource or the IPMI 'Chassis Control' command."/>
+        </Member>
+        <Member Name="PowerRestorePolicy">
+          <Annotation Term="OData.Description" String="System start or restart due to the power restore policy."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the system automatically powered-up on AC being applied due the `PowerRestorePolicy` property containing `AlwaysOn` or `LastState`."/>
+        </Member>
+        <Member Name="RTCWakeup">
+          <Annotation Term="OData.Description" String="System power-up via an RTC (system real time clock) wakeup."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the system powered-up via an RTC (system real time clock) wakeup."/>
+        </Member>
+        <Member Name="WatchdogExpiration">
+          <Annotation Term="OData.Description" String="System start or restart caused by a watchdog expiration."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the system start or restart was caused by a watchdog expiration."/>
+        </Member>
+        <Member Name="OSSoftRestart">
+          <Annotation Term="OData.Description" String="System start or restart via an OS soft restart."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the system start or restart was due to an OS soft restart.  Examples include 'CTRL-ALT-DEL', 'init 6', or 'reboot'."/>
+        </Member>
+        <Member Name="SystemCrash">
+          <Annotation Term="OData.Description" String="System start or restart caused by a system crash."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the system start or restart was caused by a system crash.  Examples include an OS panic, hardware fault, or firmware fault."/>
+        </Member>
+        <Member Name="ThermalEvent">
+          <Annotation Term="OData.Description" String="System start or restart caused by a thermal event triggering a system shutdown."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the system start or restart was caused by a thermal event triggering a system shutdown."/>
+        </Member>
+        <Member Name="PowerEvent">
+          <Annotation Term="OData.Description" String="System start or restart caused by a power event triggering a system shutdown."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the system start or restart was caused by a power event triggering a system shutdown."/>
+        </Member>
+        <Member Name="Unknown">
+          <Annotation Term="OData.Description" String="System start or restart detected, but the cause is unknown."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the system start or restart cause is unknown."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Control_v1.xml b/redfish-core/schema/dmtf/csdl/Control_v1.xml
index 9aa8818..0d98d48 100644
--- a/redfish-core/schema/dmtf/csdl/Control_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Control_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Control v1.5.1                                                      -->
+<!--# Redfish Schema:  Control v1.5.2                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -142,8 +142,8 @@
         </Property>
         <Property Name="SetPointUnits" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The units of the set point."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the units of the control's set point."/>
+          <Annotation Term="OData.Description" String="The units of the set point and related properties in UCUM c/s format."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the units of the control's set point and related properties.  The value shall follow the case-sensitive symbol format defined by the Unified Code for Units of Measure (UCUM), as specified by the 'Units of measure annotation' clause of the Redfish Specification."/>
         </Property>
         <Property Name="DeadBand" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -449,6 +449,12 @@
       <EntityType Name="Control" BaseType="Control.v1_0_2.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_0_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `SetPointUnits`."/>
+      <EntityType Name="Control" BaseType="Control.v1_0_3.Control"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -469,6 +475,12 @@
       <EntityType Name="Control" BaseType="Control.v1_1_1.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_1_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `SetPointUnits`."/>
+      <EntityType Name="Control" BaseType="Control.v1_1_2.Control"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -489,6 +501,12 @@
       <EntityType Name="Control" BaseType="Control.v1_2_1.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_2_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `SetPointUnits`."/>
+      <EntityType Name="Control" BaseType="Control.v1_2_2.Control"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -516,6 +534,12 @@
       <EntityType Name="Control" BaseType="Control.v1_3_1.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_3_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `SetPointUnits`."/>
+      <EntityType Name="Control" BaseType="Control.v1_3_2.Control"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -542,6 +566,12 @@
       <EntityType Name="Control" BaseType="Control.v1_4_1.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_4_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `SetPointUnits`."/>
+      <EntityType Name="Control" BaseType="Control.v1_4_2.Control"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -556,5 +586,11 @@
       <EntityType Name="Control" BaseType="Control.v1_5_0.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_5_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `SetPointUnits`."/>
+      <EntityType Name="Control" BaseType="Control.v1_5_1.Control"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Drive_v1.xml b/redfish-core/schema/dmtf/csdl/Drive_v1.xml
index 9578740..c577056 100644
--- a/redfish-core/schema/dmtf/csdl/Drive_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Drive_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################               -->
-<!--# Redfish Schema:  Drive v1.20.0                                                               -->
+<!--# Redfish Schema:  Drive v1.20.1                                                               -->
 <!--#                                                                                              -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,              -->
 <!--# available at http://www.dmtf.org/standards/redfish                                           -->
@@ -568,6 +568,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_0_17.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_0_19">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_0_18.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -724,6 +730,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_1_16.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_1_18">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_1_17.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -830,6 +842,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_2_14.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_2_16">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_2_15.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -928,6 +946,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_3_13.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_3_15">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_3_14.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -1024,6 +1048,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_4_13.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_4_15">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_4_14.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -1124,6 +1154,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_5_12.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_5_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_5_13.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -1205,6 +1241,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_6_10.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_6_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_6_11.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -1279,6 +1321,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_7_9.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_7_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_7_10.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -1355,6 +1403,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_8_9.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_8_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_8_10.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -1428,6 +1482,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_9_9.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_9_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_9_10.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -1489,6 +1549,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_10_7.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_10_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_10_8.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -1551,6 +1617,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_11_7.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_11_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_11_8.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -1626,6 +1698,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_12_6.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_12_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_12_7.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1672,6 +1750,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_13_4.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_13_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_13_5.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_14_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -1713,6 +1797,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_14_3.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_14_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_14_4.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_15_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -1760,6 +1850,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_15_3.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_15_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_15_4.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_16_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -1913,6 +2009,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_16_3.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_16_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_16_4.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_17_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -1958,6 +2060,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_17_2.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_17_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_17_3.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_18_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -1972,6 +2080,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_18_0.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_18_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_18_1.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_19_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -2011,6 +2125,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_19_0.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_19_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_19_1.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_20_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.2"/>
@@ -2095,5 +2215,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_20_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_20_0.Drive"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/EventDestination_v1.xml b/redfish-core/schema/dmtf/csdl/EventDestination_v1.xml
index ecdcdad..f31bdb0 100644
--- a/redfish-core/schema/dmtf/csdl/EventDestination_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/EventDestination_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  EventDestination v1.14.1                                            -->
+<!--# Redfish Schema:  EventDestination v1.15.0                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -959,8 +959,8 @@
         <Property Name="AuthenticationKey" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Write"/>
           <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark."/>
-          <Annotation Term="Validation.Pattern" String="(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\*+$)"/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414."/>
+          <Annotation Term="Validation.Pattern" String="(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{24,96}$)|(^\*+$)"/>
         </Property>
         <Property Name="AuthenticationProtocol" Type="EventDestination.v1_7_0.SNMPAuthenticationProtocols">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -970,8 +970,8 @@
         <Property Name="EncryptionKey" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Write"/>
           <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark."/>
-          <Annotation Term="Validation.Pattern" String="(^[A-Za-z0-9]+$)|(^\*+$)"/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414."/>
+          <Annotation Term="Validation.Pattern" String="(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{16,64}$)|(^\*+$)"/>
         </Property>
         <Property Name="EncryptionProtocol" Type="EventDestination.v1_7_0.SNMPEncryptionProtocols">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -1141,6 +1141,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_7_8.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_7_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_7_9.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -1208,6 +1214,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_8_8.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_8_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_8_9.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -1426,6 +1438,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_9_9.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_9_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_9_10.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to add additional SNMP authentication protocols and to provide better description for the authentication and encryption keys.  It also added `RetryForeverWithBackoff` to `DeliveryRetryPolicy` and long description details to the `DeliveryRetryPolicy` values."/>
@@ -1501,6 +1519,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_10_8.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_10_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_10_9.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1569,6 +1593,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_11_6.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_11_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_11_7.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -1618,6 +1648,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_12_4.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_12_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_12_5.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -1656,6 +1692,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_13_3.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_13_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_13_4.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_14_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -1670,5 +1712,25 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_14_0.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_14_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` property."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_14_1.EventDestination"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_15_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_14_2.EventDestination">
+        <Property Name="BackupDestinations" Type="Collection(Edm.String)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The backup destination URIs for this event receiver.  Events are sent to these URIs, in array order, when the destination URI is unreachable or returns an error."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of URIs to destination where events are sent if the event receiver specified by `Destination` is unreachable or returns an error.  Events are sent to each of the backup destinations, in array order, until a destination has been reached.  An empty array shall indicate that the service supports backup event receivers, but none have been specified by the user."/>
+          <Annotation Term="OData.IsURL"/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Event_v1.xml b/redfish-core/schema/dmtf/csdl/Event_v1.xml
index 4e38140..8ffc01a 100644
--- a/redfish-core/schema/dmtf/csdl/Event_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Event_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Event v1.10.1                                                       -->
+<!--# Redfish Schema:  Event v1.11.0                                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -977,5 +977,25 @@
       <EntityType Name="EventRecord" BaseType="Event.v1_10_0.EventRecord"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_11_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+
+      <EntityType Name="Event" BaseType="Event.v1_10_1.Event"/>
+
+      <EntityType Name="EventRecord" BaseType="Event.v1_10_1.EventRecord">
+        <Property Name="Username" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The username of the account associated with the event record."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the username of the account associated with the event record.  This should be used for events that result from a user action."/>
+        </Property>
+        <Property Name="UserAuthenticationSource" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The source of authentication for the username property associated with the event record."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the URL to the authentication service that is associated with the username property.  This should be used for events that result from a user action."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ExternalAccountProvider_v1.xml b/redfish-core/schema/dmtf/csdl/ExternalAccountProvider_v1.xml
index 9142449..ee3ba0a 100644
--- a/redfish-core/schema/dmtf/csdl/ExternalAccountProvider_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ExternalAccountProvider_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ExternalAccountProvider v1.7.2                                      -->
+<!--# Redfish Schema:  ExternalAccountProvider v1.8.0                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -31,6 +31,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/AccountService_v1.xml">
     <edmx:Include Namespace="AccountService"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ManagerAccount_v1.xml">
+    <edmx:Include Namespace="ManagerAccount"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -735,5 +738,25 @@
       <EntityType Name="ExternalAccountProvider" BaseType="ExternalAccountProvider.v1_7_1.ExternalAccountProvider"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ExternalAccountProvider.v1_8_0">
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="ExternalAccountProvider" BaseType="ExternalAccountProvider.v1_7_2.ExternalAccountProvider"/>
+
+      <ComplexType Name="RoleMapping" BaseType="ExternalAccountProvider.v1_5_0.RoleMapping">
+        <Property Name="LocalAccountTypes" Type="Collection(ManagerAccount.AccountTypes)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The list of local services in the manager that the remote user or group is allowed to access."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the various local manager services that the remote user or group is allowed to access.  This shall not include functionality for receiving events or other notifications.  If this property is not supported, the value shall be assumed to be an array that contains the value `Redfish`."/>
+        </Property>
+        <Property Name="LocalOEMAccountTypes" Type="Collection(Edm.String)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The OEM account types for the remote user or group."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the OEM account types for the remote user or group when `LocalAccountTypes` contains `OEM`."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/LeakDetection_v1.xml b/redfish-core/schema/dmtf/csdl/LeakDetection_v1.xml
index c375763..97284a1 100644
--- a/redfish-core/schema/dmtf/csdl/LeakDetection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/LeakDetection_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  LeakDetection v1.0.1                                                -->
+<!--# Redfish Schema:  LeakDetection v1.1.0                                                -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -137,5 +137,20 @@
       <EntityType Name="LeakDetection" BaseType="LeakDetection.v1_0_0.LeakDetection"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LeakDetection.v1_1_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+
+      <EntityType Name="LeakDetection" BaseType="LeakDetection.v1_0_1.LeakDetection"/>
+
+      <ComplexType Name="LeakDetectorGroup" BaseType="LeakDetection.v1_0_0.LeakDetectorGroup">
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+          <Annotation Term="Redfish.Required"/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/LeakDetector_v1.xml b/redfish-core/schema/dmtf/csdl/LeakDetector_v1.xml
index 6ef9f50..2b25802 100644
--- a/redfish-core/schema/dmtf/csdl/LeakDetector_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/LeakDetector_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  LeakDetector v1.1.0                                                 -->
+<!--# Redfish Schema:  LeakDetector v1.2.0                                                 -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -97,7 +97,7 @@
         <Property Name="DetectorState" Type="Resource.Health">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The state of the leak detector."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the state of the leak detector."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the state of the leak detector.  The value of this property should equate the value of `Health` in `Status`, and was created primarily for use in excerpts of this resource."/>
           <Annotation Term="Redfish.Excerpt"/>
         </Property>
         <Property Name="PhysicalContext" Type="PhysicalContext.PhysicalContext">
@@ -195,6 +195,12 @@
       <EntityType Name="LeakDetector" BaseType="LeakDetector.v1_0_1.LeakDetector"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LeakDetector.v1_0_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that the value of `DetectorState` should reflect the `Health` of the detector."/>
+      <EntityType Name="LeakDetector" BaseType="LeakDetector.v1_0_2.LeakDetector"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LeakDetector.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -208,5 +214,26 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LeakDetector.v1_1_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that the value of `DetectorState` should reflect the `Health` of the detector."/>
+      <EntityType Name="LeakDetector" BaseType="LeakDetector.v1_0_3.LeakDetector"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LeakDetector.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+
+      <EntityType Name="LeakDetector" BaseType="LeakDetector.v1_1_1.LeakDetector">
+        <Property Name="DeviceName" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The name of the device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the name of the device associated with this leak detector.  If the device is represented by a resource, the value shall contain the value of the `Name` property of the associated resource."/>
+          <Annotation Term="Redfish.Excerpt" String="Array"/>
+          <Annotation Term="Redfish.ExcerptCopyOnly"/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml b/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
index fa348f3..d65e3a8 100644
--- a/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  LogEntry v1.16.2                                                    -->
+<!--# Redfish Schema:  LogEntry v1.17.0                                                    -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -1968,5 +1968,23 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_16_1.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_17_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_16_2.LogEntry">
+        <Property Name="Username" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The username of the account associated with the log entry."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the username of the account associated with the log entry.  This should be used for audit logs that result from a user action."/>
+        </Property>
+        <Property Name="UserAuthenticationSource" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The source of authentication for the username property associated with the log entry."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the URL to the authentication service that is associated with the username property.  This should be used for audit logs that result from a user action."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ManagerAccount_v1.xml b/redfish-core/schema/dmtf/csdl/ManagerAccount_v1.xml
index e61094b..0baf4bf 100644
--- a/redfish-core/schema/dmtf/csdl/ManagerAccount_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ManagerAccount_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ManagerAccount v1.12.1                                              -->
+<!--# Redfish Schema:  ManagerAccount v1.13.0                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -94,6 +94,53 @@
         </Parameter>
       </Action>
 
+      <Action Name="GenerateSecretKey" IsBound="true">
+        <Annotation Term="OData.Description" String="This action randomly generates a new secret key for Time-based One-Time Password (TOTP) multi-factor authentication for this account."/>
+        <Annotation Term="OData.LongDescription" String="This action shall randomly generate a new secret key for RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication for this account."/>
+        <Parameter Name="ManagerAccount" Type="ManagerAccount.v1_1_0.Actions"/>
+        <ReturnType Type="ManagerAccount.v1_13_0.GenerateSecretKeyResponse" Nullable="false"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_13_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+
+      <Action Name="ClearSecretKey" IsBound="true">
+        <Annotation Term="OData.Description" String="This action clears the secret key for Time-based One-Time Password (TOTP) multi-factor authentication for this account."/>
+        <Annotation Term="OData.LongDescription" String="This action shall clear the secret key for RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication for this account."/>
+        <Parameter Name="ManagerAccount" Type="ManagerAccount.v1_1_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_13_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+
+      <Action Name="VerifyTimeBasedOneTimePassword" IsBound="true">
+        <Annotation Term="OData.Description" String="This action verifies a user-provided Time-based One-Time Password (TOTP).  This is to ensure the client's copy of the secret key is aligned with the secret key stored by the service."/>
+        <Annotation Term="OData.LongDescription" String="This action shall verify a user-provided RFC6238-defined Time-based One-Time Password (TOTP)."/>
+        <Parameter Name="ManagerAccount" Type="ManagerAccount.v1_1_0.Actions"/>
+        <Parameter Name="TimeBasedOneTimePassword" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Description" String="The Time-based One-Time Password (TOTP) to verify."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the Time-based One-Time Password (TOTP) to verify.  If the Time-based One-Time Password (TOTP) is not valid, the service shall return the HTTP `400 Bad Request` status code."/>
+        </Parameter>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_13_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+
       <EnumType Name="AccountTypes">
         <Annotation Term="Redfish.Revisions">
           <Collection>
@@ -559,8 +606,8 @@
         <Property Name="AuthenticationKey" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Write"/>
           <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark."/>
-          <Annotation Term="Validation.Pattern" String="(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\*+$)"/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414."/>
+          <Annotation Term="Validation.Pattern" String="(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\*+$)"/>
         </Property>
         <Property Name="AuthenticationProtocol" Type="ManagerAccount.v1_4_0.SNMPAuthenticationProtocols">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -570,8 +617,8 @@
         <Property Name="EncryptionKey" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Write"/>
           <Annotation Term="OData.Description" String="The secret encryption key used in SNMPv3."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark."/>
-          <Annotation Term="Validation.Pattern" String="(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{32})|(^\*+$)"/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414."/>
+          <Annotation Term="Validation.Pattern" String="(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{16,64}$)|(^\*+$)"/>
         </Property>
         <Property Name="EncryptionProtocol" Type="ManagerAccount.v1_4_0.SNMPEncryptionProtocols">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -737,6 +784,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_4_8.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_4_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` and `EncryptionKey` properties."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_4_9.ManagerAccount"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -805,6 +858,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_5_7.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_5_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` and `EncryptionKey` properties."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_5_8.ManagerAccount"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -860,6 +919,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_6_6.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_6_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` and `EncryptionKey` properties."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_6_7.ManagerAccount"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -904,6 +969,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_7_4.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_7_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` and `EncryptionKey` properties."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_7_5.ManagerAccount"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -946,6 +1017,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_8_3.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_8_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` and `EncryptionKey` properties."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_8_4.ManagerAccount"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -977,6 +1054,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_9_2.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_9_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` and `EncryptionKey` properties."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_9_3.ManagerAccount"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -1001,6 +1084,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_10_1.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_10_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` and `EncryptionKey` properties."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_10_2.ManagerAccount"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -1037,6 +1126,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_11_1.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_11_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` and `EncryptionKey` properties."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_11_2.ManagerAccount"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -1051,5 +1146,36 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_12_0.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_12_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the regular expression pattern for the SNMP `AuthenticationKey` and `EncryptionKey` properties."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_12_1.ManagerAccount"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_13_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+      <Annotation Term="OData.Description" String="This version was created to add the `GenerateSecretKey`, `ClearSecretKey`, and `VerifyTimeBasedOneTimePassword` actions."/>
+
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_12_2.ManagerAccount">
+        <Property Name="SecretKeySet" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates if the secret key for Time-based One-Time Password (TOTP) multi-factor authentication is set."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if the secret key for RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication is set."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="GenerateSecretKeyResponse">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The response body for the `GenerateSecretKey` action."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the properties found in the response body for the `GenerateSecretKey` action."/>
+        <Property Name="SecretKey" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The secret key generated for Time-based One-Time Password (TOTP) multi-factor authentication."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain secret key generated for RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication.  Clients shall retain the value of this property to generate tokens for future session creation requests."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Manager_v1.xml b/redfish-core/schema/dmtf/csdl/Manager_v1.xml
index 128b8bc..7aa3241 100644
--- a/redfish-core/schema/dmtf/csdl/Manager_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Manager_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Manager v1.19.1                                                     -->
+<!--# Redfish Schema:  Manager v1.19.2                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -260,12 +260,12 @@
           </Annotation>
         </Property>
         <Property Name="CommandShell" Type="Manager.v1_0_0.CommandShell" Nullable="false">
-          <Annotation Term="OData.Description" String="The command shell service that this manager provides."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain information about the command shell service of this manager."/>
+          <Annotation Term="OData.Description" String="The manager's command line user interface or command shell service."/>
+          <Annotation Term="OData.LongDescription" String="This property shall describe a command line user interface or command shell service provided by this manager.  The command shell refers to an interface used to interact with the manager itself, not a dedicated console session redirected from a host operating system.  For redirected serial or host operating system consoles, see the `SerialConsole` property in the `ComputerSystem` resource."/>
         </Property>
         <Property Name="GraphicalConsole" Type="Manager.v1_0_0.GraphicalConsole" Nullable="false">
-          <Annotation Term="OData.Description" String="The information about the graphical console service of this manager."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the information about the graphical console (KVM-IP) service of this manager.  This property should be used to describe a service for the manager's console or operating system, not a service provided on behalf of a host operating system.  Implementations representing host OS consoles, known generally as a KVM-IP feature, should use the `GraphicalConsole` property in ComputerSystem."/>
+          <Annotation Term="OData.Description" String="The manager's graphical console service."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the information about the graphical console (KVM-IP) service of this manager.  This property should be used to describe a service for the manager's console or operating system, not a service provided on behalf of a host operating system.  Implementations representing host OS consoles, known generally as a KVM-IP feature, should use the `GraphicalConsole` property in the `ComputerSystem` resource."/>
         </Property>
         <Property Name="Actions" Type="Manager.v1_0_0.Actions" Nullable="false">
           <Annotation Term="OData.Description" String="The available actions for this resource."/>
@@ -541,6 +541,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_0_17.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_0_19">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_0_18.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.1"/>
@@ -653,6 +659,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_1_15.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_1_17">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_1_16.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -762,6 +774,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_2_15.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_2_17">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_2_16.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.3"/>
@@ -866,6 +884,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_3_14.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_3_16">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_3_15.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -960,6 +984,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_4_11.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_4_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_4_12.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -1046,6 +1076,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_5_10.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_5_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_5_11.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -1116,6 +1152,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_6_7.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_6_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_6_8.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -1187,6 +1229,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_7_7.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_7_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_7_8.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -1249,6 +1297,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_8_6.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_8_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_8_7.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -1313,6 +1367,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_9_5.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_9_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_9_6.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -1357,6 +1417,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_10_4.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_10_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_10_5.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -1403,6 +1469,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_11_3.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_11_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_11_4.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -1433,6 +1505,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_12_2.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_12_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_12_3.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1472,6 +1550,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_13_1.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_13_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_13_2.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_14_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -1498,6 +1582,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_14_1.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_14_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_14_2.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_15_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -1527,6 +1617,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_15_1.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_15_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_15_2.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_16_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -1560,6 +1656,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_16_1.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_16_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_16_2.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_17_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -1585,6 +1687,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_17_1.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_17_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_17_2.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_18_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -1612,6 +1720,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_18_1.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_18_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_18_2.Manager"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_19_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -1656,5 +1770,11 @@
       <EntityType Name="Manager" BaseType="Manager.v1_19_0.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_19_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `CommandShell` property.  It was also was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_19_1.Manager"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/MemoryRegion_v1.xml b/redfish-core/schema/dmtf/csdl/MemoryRegion_v1.xml
index 4b7b645..e0373dc 100644
--- a/redfish-core/schema/dmtf/csdl/MemoryRegion_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/MemoryRegion_v1.xml
@@ -226,7 +226,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryRegion.v1_0_3">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to clarify the defintion of the `Tag` property."/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the definition of the `Tag` property."/>
       <EntityType Name="MemoryRegion" BaseType="MemoryRegion.v1_0_2.MemoryRegion"/>
     </Schema>
 
diff --git a/redfish-core/schema/dmtf/csdl/Message_v1.xml b/redfish-core/schema/dmtf/csdl/Message_v1.xml
index ed42f02..0bcd23c 100644
--- a/redfish-core/schema/dmtf/csdl/Message_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Message_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Message v1.2.1                                                      -->
+<!--# Redfish Schema:  Message v1.3.0                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -215,5 +215,23 @@
       <ComplexType Name="Message" BaseType="Message.v1_2_0.Message"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Message.v1_3_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+
+      <ComplexType Name="Message" BaseType="Message.v1_2_1.Message">
+        <Property Name="Username" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The username of the account associated with the message."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the username of the account associated with the message.  This should be used for messages that result from a user action."/>
+        </Property>
+        <Property Name="UserAuthenticationSource" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The source of authentication for the username property associated with the message."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the URL to the authentication service that is associated with the username property.  This should be used for messages that result from a user action."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/PCIeDevice_v1.xml b/redfish-core/schema/dmtf/csdl/PCIeDevice_v1.xml
index c20c4f3..e545483 100644
--- a/redfish-core/schema/dmtf/csdl/PCIeDevice_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/PCIeDevice_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  PCIeDevice v1.15.0                                                  -->
+<!--# Redfish Schema:  PCIeDevice v1.16.0                                                  -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -124,6 +124,17 @@
         <Member Name="Gen5">
           <Annotation Term="OData.Description" String="A PCIe v5.0 slot."/>
         </Member>
+        <Member Name="Gen6">
+          <Annotation Term="OData.Description" String="A PCIe v6.0 slot."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_16_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
     </Schema>
@@ -1142,5 +1153,12 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PCIeDevice.v1_16_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+
+      <EntityType Name="PCIeDevice" BaseType="PCIeDevice.v1_15_0.PCIeDevice"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/PhysicalContext_v1.xml b/redfish-core/schema/dmtf/csdl/PhysicalContext_v1.xml
index cab36b4..84e1521 100644
--- a/redfish-core/schema/dmtf/csdl/PhysicalContext_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/PhysicalContext_v1.xml
@@ -167,23 +167,51 @@
         <Member Name="StorageDevice">
           <Annotation Term="OData.Description" String="A storage device."/>
         </Member>
+        <Member Name="StorageSubsystem">
+          <Annotation Term="OData.Description" String="A storage subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a storage subsystem, which may consist of one or more storage controllers, storage devices, or related components."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="2024.3"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
         <Member Name="NetworkingDevice">
           <Annotation Term="OData.Description" String="A networking device."/>
         </Member>
+        <Member Name="ExpansionSubsystem">
+          <Annotation Term="OData.Description" String="A group of expansion bays."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a group of expansion bays and the devices installed in those bays."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="2024.3"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
         <Member Name="ComputeBay">
-          <Annotation Term="OData.Description" String="Within a compute bay."/>
+          <Annotation Term="OData.Description" String="A compute bay."/>
         </Member>
         <Member Name="StorageBay">
-          <Annotation Term="OData.Description" String="Within a storage bay."/>
+          <Annotation Term="OData.Description" String="A storage bay."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a location that provides for the expansion of storage functionality of a system, by the addition of storage devices."/>
         </Member>
         <Member Name="NetworkBay">
-          <Annotation Term="OData.Description" String="Within a networking bay."/>
+          <Annotation Term="OData.Description" String="A networking bay."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a location that provides for the expansion of networking functionality of a system, by the addition of networking devices."/>
         </Member>
         <Member Name="ExpansionBay">
-          <Annotation Term="OData.Description" String="Within an expansion bay."/>
+          <Annotation Term="OData.Description" String="An expansion bay."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a location that provides for the expansion of functionality of a system, such as a PCIe slot that can accept an option card."/>
         </Member>
         <Member Name="PowerSupplyBay">
-          <Annotation Term="OData.Description" String="Within a power supply bay."/>
+          <Annotation Term="OData.Description" String="A power supply bay."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a location that provides for the installation of a power supply or similar devices."/>
         </Member>
         <Member Name="Memory">
           <Annotation Term="OData.Description" String="A memory device."/>
@@ -263,7 +291,8 @@
           </Annotation>
         </Member>
         <Member Name="ACUtilityInput">
-          <Annotation Term="OData.Description" String="An AC utility input."/>
+          <Annotation Term="OData.Description" String="An AC electrical utility input."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate an electrical input, where the source is an electrical utility as opposed to a backup or locally-generated power source.  This value is intended to differentiate multiple electrical inputs between utility, maintenance bypass, or static bypass values.  For general purpose usage, the value of `ACInput` is preferred."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -274,7 +303,7 @@
           </Annotation>
         </Member>
         <Member Name="ACStaticBypassInput">
-          <Annotation Term="OData.Description" String="An AC static bypass input."/>
+          <Annotation Term="OData.Description" String="An AC electrical static bypass input."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -285,7 +314,7 @@
           </Annotation>
         </Member>
         <Member Name="ACMaintenanceBypassInput">
-          <Annotation Term="OData.Description" String="An AC maintenance bypass input."/>
+          <Annotation Term="OData.Description" String="An AC electrical maintenance bypass input."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -296,7 +325,7 @@
           </Annotation>
         </Member>
         <Member Name="DCBus">
-          <Annotation Term="OData.Description" String="A DC bus."/>
+          <Annotation Term="OData.Description" String="A DC electrical bus."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -307,7 +336,8 @@
           </Annotation>
         </Member>
         <Member Name="ACOutput">
-          <Annotation Term="OData.Description" String="An AC output."/>
+          <Annotation Term="OData.Description" String="An AC electrical output or output-related circuit."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate an electrical output or an output-related circuit, such as a branch output, which is not terminated as a power outlet."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -318,7 +348,7 @@
           </Annotation>
         </Member>
         <Member Name="ACInput">
-          <Annotation Term="OData.Description" String="An AC input."/>
+          <Annotation Term="OData.Description" String="An AC electrical input or input-related circuit."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -328,6 +358,18 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="PowerOutlet">
+          <Annotation Term="OData.Description" String="An electrical outlet."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate an electrical outlet or receptacle."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="2024.3"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
         <Member Name="TrustedModule">
           <Annotation Term="OData.Description" String="A trusted module."/>
           <Annotation Term="Redfish.Revisions">
diff --git a/redfish-core/schema/dmtf/csdl/PortMetrics_v1.xml b/redfish-core/schema/dmtf/csdl/PortMetrics_v1.xml
index be39a42..9b7084b 100644
--- a/redfish-core/schema/dmtf/csdl/PortMetrics_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/PortMetrics_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  PortMetrics v1.6.0                                                  -->
+<!--# Redfish Schema:  PortMetrics v1.7.0                                                  -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -731,5 +731,21 @@
       <EntityType Name="PortMetrics" BaseType="PortMetrics.v1_6_0.PortMetrics"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PortMetrics.v1_7_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+
+      <EntityType Name="PortMetrics" BaseType="PortMetrics.v1_6_1.PortMetrics"/>
+
+      <ComplexType Name="Transceiver" BaseType="PortMetrics.v1_1_0.Transceiver">
+        <Property Name="WavelengthNanometers" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The laser wavelength, in nanometers, for a small form-factor pluggable (SFP) transceiver."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the laser wavelength, in nanometers, for a small form-factor pluggable (SFP) transceiver.  This property shall not be present for non-optic SFP mediums."/>
+          <Annotation Term="Measures.Unit" String="nm"/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Port_v1.xml b/redfish-core/schema/dmtf/csdl/Port_v1.xml
index febc639..f234731 100644
--- a/redfish-core/schema/dmtf/csdl/Port_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Port_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Port v1.13.0                                                        -->
+<!--# Redfish Schema:  Port v1.14.0                                                        -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -1931,5 +1931,20 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_14_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+
+      <EntityType Name="Port" BaseType="Port.v1_13_0.Port"/>
+
+      <ComplexType Name="SFP" BaseType="Port.v1_13_0.SFP">
+        <Property Name="DateCode" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The manufacturing date code for this SFP."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the manufacturing date code for this SFP as determined by the vendor or supplier."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Resource_v1.xml b/redfish-core/schema/dmtf/csdl/Resource_v1.xml
index dcaaa57..e4c3781 100644
--- a/redfish-core/schema/dmtf/csdl/Resource_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Resource_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Resource v1.19.1                                                    -->
+<!--# Redfish Schema:  Resource v1.20.0                                                    -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -202,6 +202,32 @@
             </Collection>
           </Annotation>
         </Property>
+        <Property Name="Username" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The username of the account associated with the condition."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the username of the account associated with the condition.  This should be used for conditions that result from a user action."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_20_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Property>
+        <Property Name="UserAuthenticationSource" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The source of authentication for the username property associated with the condition."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the URL to the authentication service that is associated with the username property.  This should be used for conditions that result from a user action."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_20_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Property>
       </ComplexType>
 
       <EnumType Name="State">
@@ -2210,5 +2236,11 @@
       <Annotation Term="OData.Description" String="This version was created to add references in property long descriptions to the Redfish Data Model Specification where additional requirements or details are provided."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_20_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+      <Annotation Term="OData.Description" String="This version was created to add `Username` and `UserAuthenticationSource` to the `Condition` property in `Status`."/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Sensor_v1.xml b/redfish-core/schema/dmtf/csdl/Sensor_v1.xml
index 87e1313..13c76b1 100644
--- a/redfish-core/schema/dmtf/csdl/Sensor_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Sensor_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Sensor v1.10.0                                                      -->
+<!--# Redfish Schema:  Sensor v1.10.1                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -216,8 +216,8 @@
         </Property>
         <Property Name="ReadingUnits" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The units of the reading and thresholds."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the units of the sensor's reading and thresholds."/>
+          <Annotation Term="OData.Description" String="The units of the reading, thresholds, and other reading-related properties in UCUM c/s format."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the units of the sensor's reading, thresholds, and other reading-related properties.  The value shall follow the case-sensitive symbol format defined by the Unified Code for Units of Measure (UCUM), as specified by the 'Units of measure annotation' clause of the Redfish Specification."/>
         </Property>
         <Property Name="PhysicalContext" Type="PhysicalContext.PhysicalContext">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -737,6 +737,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_0_10.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_0_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `ReadingUnits`."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_0_11.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -835,6 +841,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_1_6.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_1_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `ReadingUnits`."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_1_7.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -913,6 +925,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_2_4.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_2_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `ReadingUnits`."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_2_5.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -960,6 +978,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_3_4.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_3_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `ReadingUnits`."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_3_5.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1040,6 +1064,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_4_3.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_4_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `ReadingUnits`."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_4_4.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -1089,6 +1119,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_5_2.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_5_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `ReadingUnits`."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_5_3.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -1115,6 +1151,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_6_2.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_6_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `ReadingUnits`."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_6_3.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -1169,6 +1211,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_7_1.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_7_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `ReadingUnits`."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_7_2.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -1195,6 +1243,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_8_1.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_8_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `ReadingUnits`."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_8_2.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -1243,6 +1297,12 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_9_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `ReadingUnits`."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_9_0.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.2"/>
@@ -1251,10 +1311,16 @@
         <Property Name="Enabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Indicates whether the sensor is enabled and provides a reading."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the sensor is enabled and provides a `Reading`.  The value `true` shall indicate the sensor is enabled and returns the `Reading` property with a valid value.  The value `false` shall indicate the sensor is disabled, and shall not return the `Reading` property."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the sensor is enabled and provides a `Reading`.  The value `true` shall indicate the sensor is enabled and returns the `Reading` property with a valid value.  The value `false` shall indicate the sensor is disabled, shall not return the `Reading` property, and shall not trigger events, logging, or other functionality.  This property allows a user to disable a faulty sensor or to otherwise remove it from use."/>
         </Property>
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_10_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add references to formats defined by the UCUM specification in the description of `ReadingUnits`.  It was also created to improve the description of the `Enabled` property."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_10_0.Sensor"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/StorageController_v1.xml b/redfish-core/schema/dmtf/csdl/StorageController_v1.xml
index 9200ef0..b552021 100644
--- a/redfish-core/schema/dmtf/csdl/StorageController_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/StorageController_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  StorageController v1.7.3                                            -->
+<!--# Redfish Schema:  StorageController v1.8.0                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -890,5 +890,27 @@
       <EntityType Name="StorageController" BaseType="StorageController.v1_7_2.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="StorageController.v1_7_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="StorageController" BaseType="StorageController.v1_7_3.StorageController"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="StorageController.v1_8_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.3"/>
+
+      <EntityType Name="StorageController" BaseType="StorageController.v1_7_4.StorageController"/>
+
+      <ComplexType Name="NVMeControllerProperties" BaseType="StorageController.v1_4_0.NVMeControllerProperties">
+        <Property Name="MaxAttachedNamespaces" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The maximum number of attached namespaces allowed by this NVMe I/O controller."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the maximum number of attached namespaces allowed by this NVMe I/O controller."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Storage_v1.xml b/redfish-core/schema/dmtf/csdl/Storage_v1.xml
index 07a9e81..90501cd 100644
--- a/redfish-core/schema/dmtf/csdl/Storage_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Storage_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################                   -->
-<!--# Redfish Schema:  Storage v1.17.0                                                                 -->
+<!--# Redfish Schema:  Storage v1.17.1                                                                 -->
 <!--#                                                                                                  -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,                  -->
 <!--# available at http://www.dmtf.org/standards/redfish                                               -->
@@ -466,6 +466,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_0_12.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_0_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_0_13.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_0_13.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -574,6 +581,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_1_11.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_1_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_1_12.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_1_12.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -674,6 +688,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_2_9.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_2_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_2_10.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_2_10.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.2"/>
@@ -759,6 +780,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_3_9.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_3_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_3_10.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_3_10.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -859,6 +887,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_4_9.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_4_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_4_10.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_4_10.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -958,6 +993,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_5_7.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_5_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_5_8.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_5_8.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -1022,6 +1064,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_6_6.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_6_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_6_7.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_6_7.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -1118,6 +1167,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_7_5.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_7_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_7_6.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_7_6.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -1202,6 +1258,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_8_4.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_8_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_8_5.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_8_5.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -1265,6 +1328,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_9_3.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_9_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_9_4.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_9_4.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -1315,6 +1385,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_10_2.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_10_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_10_3.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_10_3.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1357,6 +1434,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_11_1.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_11_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_11_2.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_11_2.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -1380,6 +1464,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_12_1.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_12_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_12_2.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_12_2.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -1403,6 +1494,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_13_1.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_13_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_13_2.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_13_2.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_14_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -1499,6 +1597,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_14_1.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_14_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_14_2.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_14_2.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_15_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -1557,6 +1662,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_15_1.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_15_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_15_2.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_15_2.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_16_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -1614,6 +1726,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_16_0.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_16_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_16_1.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_16_1.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_17_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.2"/>
@@ -1689,5 +1808,12 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_17_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_17_0.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_17_0.StorageController"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/UpdateService_v1.xml b/redfish-core/schema/dmtf/csdl/UpdateService_v1.xml
index eddc8ea..7c2a5dd 100644
--- a/redfish-core/schema/dmtf/csdl/UpdateService_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/UpdateService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  UpdateService v1.14.0                                               -->
+<!--# Redfish Schema:  UpdateService v1.14.1                                               -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -367,6 +367,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_0_10.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_0_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_0_11.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.3"/>
@@ -453,6 +459,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_1_11.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_1_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_1_12.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -550,6 +562,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_2_12.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_2_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_2_13.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -624,6 +642,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_3_10.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_3_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_3_11.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -784,6 +808,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_4_10.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_4_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_4_11.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -858,6 +888,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_5_9.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_5_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_5_10.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -938,6 +974,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_6_9.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_6_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_6_10.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -1000,6 +1042,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_7_8.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_7_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_7_9.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -1068,6 +1116,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_8_8.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_8_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_8_9.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -1123,6 +1177,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_9_5.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_9_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_9_6.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1173,6 +1233,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_10_5.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_10_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_10_6.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -1227,6 +1293,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_11_4.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_11_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_11_5.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -1258,6 +1330,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_12_1.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_12_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_12_2.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -1309,6 +1387,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_13_0.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_13_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_13_1.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_14_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -1317,5 +1401,11 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_13_1.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_14_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the OpenAPI usage of payload annotations in action request bodies."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_14_0.UpdateService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/json-schema/AccountService.v1_15_1.json b/redfish-core/schema/dmtf/json-schema/AccountService.v1_16_0.json
similarity index 94%
rename from redfish-core/schema/dmtf/json-schema/AccountService.v1_15_1.json
rename to redfish-core/schema/dmtf/json-schema/AccountService.v1_16_0.json
index f168806..fbb79f8 100644
--- a/redfish-core/schema/dmtf/json-schema/AccountService.v1_15_1.json
+++ b/redfish-core/schema/dmtf/json-schema/AccountService.v1_16_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/AccountService.v1_15_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/AccountService.v1_16_0.json",
     "$ref": "#/definitions/AccountService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -1074,7 +1074,7 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The settings related to Google Authenticator multi-factor authentication.",
+                    "description": "The settings related to Google Authenticator multi-factor authentication.  For generic Time-Based One-Time Password (TOTP) multi-factor authentication, use the `TimeBasedOneTimePassword` property.",
                     "longDescription": "This property shall contain the settings related to Google Authenticator multi-factor authentication.",
                     "versionAdded": "v1_12_0"
                 },
@@ -1087,7 +1087,7 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The settings related to Microsoft Authenticator multi-factor authentication.",
+                    "description": "The settings related to Microsoft Authenticator multi-factor authentication.  For generic Time-Based One-Time Password (TOTP) multi-factor authentication, use the `TimeBasedOneTimePassword` property.",
                     "longDescription": "This property shall contain the settings related to Microsoft Authenticator multi-factor authentication.",
                     "versionAdded": "v1_12_0"
                 },
@@ -1116,6 +1116,19 @@
                     "description": "The settings related to RSA SecurID multi-factor authentication.",
                     "longDescription": "This property shall contain the settings related to RSA SecurID multi-factor authentication.",
                     "versionAdded": "v1_12_0"
+                },
+                "TimeBasedOneTimePassword": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/TimeBasedOneTimePassword"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The settings related to Time-based One-Time Password (TOTP) multi-factor authentication.",
+                    "longDescription": "This property shall contain the settings related to RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication.",
+                    "versionAdded": "v1_16_0"
                 }
             },
             "type": "object"
@@ -1272,6 +1285,36 @@
                 }
             },
             "properties": {
+                "LocalAccountTypes": {
+                    "description": "The list of local services in the manager that the remote user or group is allowed to access.",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.json#/definitions/AccountTypes"
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
+                    },
+                    "longDescription": "This property shall contain an array of the various local manager services that the remote user or group is allowed to access.  This shall not include functionality for receiving events or other notifications.  If this property is not supported, the value shall be assumed to be an array that contains the value `Redfish`.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_16_0"
+                },
+                "LocalOEMAccountTypes": {
+                    "description": "The OEM account types for the remote user or group.",
+                    "items": {
+                        "type": [
+                            "string",
+                            "null"
+                        ]
+                    },
+                    "longDescription": "This property shall contain an array of the OEM account types for the remote user or group when `LocalAccountTypes` contains `OEM`.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_16_0"
+                },
                 "LocalRole": {
                     "description": "The name of the local Redfish role to which to map the remote user or group.",
                     "longDescription": "This property shall contain the `RoleId` property value within a role resource on this Redfish service to which to map the remote user or group.",
@@ -1486,10 +1529,53 @@
                 }
             },
             "type": "object"
+        },
+        "TimeBasedOneTimePassword": {
+            "additionalProperties": false,
+            "description": "Various settings for Time-based One-Time Password (TOTP) multi-factor authentication.",
+            "longDescription": "This type shall contain settings for RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Enabled": {
+                    "description": "An indication of whether multi-factor authentication with a Time-based One-Time Password (TOTP) is enabled.",
+                    "longDescription": "This property shall indicate whether multi-factor authentication with an RFC6238-defined Time-based One-Time Password (TOTP) is enabled.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_16_0"
+                },
+                "TimeStepSeconds": {
+                    "description": "The time step, in seconds, for calculating the one-time password.",
+                    "longDescription": "This property shall contain the RFC6238-defined time step, in seconds, for calculating the one-time password.  If this property is not supported by the service, it shall be assumed to be `30`.",
+                    "minimum": 1,
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_16_0"
+                }
+            },
+            "type": "object"
         }
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#AccountService.v1_15_1.AccountService"
+    "release": "2024.3",
+    "title": "#AccountService.v1_16_0.AccountService"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_2.json b/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_3.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_2.json
rename to redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_3.json
index b559105..b7b697b 100644
--- a/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_2.json
+++ b/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_3.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/AggregationSource.v1_4_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/AggregationSource.v1_4_3.json",
     "$ref": "#/definitions/AggregationSource",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -411,8 +411,8 @@
             "properties": {
                 "AuthenticationKey": {
                     "description": "The secret authentication key for SNMPv3.",
-                    "longDescription": "This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark.",
-                    "pattern": "(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\\*+$)",
+                    "longDescription": "This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.",
+                    "pattern": "(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{24,96}$)|(^\\*+$)",
                     "readonly": false,
                     "type": [
                         "string",
@@ -444,8 +444,8 @@
                 },
                 "EncryptionKey": {
                     "description": "The secret authentication key for SNMPv3.",
-                    "longDescription": "This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark.",
-                    "pattern": "(^[A-Za-z0-9]+$)|(^\\*+$)",
+                    "longDescription": "This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.",
+                    "pattern": "(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{16,64}$)|(^\\*+$)",
                     "readonly": false,
                     "type": [
                         "string",
@@ -576,5 +576,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.3",
-    "title": "#AggregationSource.v1_4_2.AggregationSource"
+    "title": "#AggregationSource.v1_4_3.AggregationSource"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/CXLLogicalDevice.v1_2_0.json b/redfish-core/schema/dmtf/json-schema/CXLLogicalDevice.v1_2_1.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/CXLLogicalDevice.v1_2_0.json
rename to redfish-core/schema/dmtf/json-schema/CXLLogicalDevice.v1_2_1.json
index 26807b4..4f4e69c 100644
--- a/redfish-core/schema/dmtf/json-schema/CXLLogicalDevice.v1_2_0.json
+++ b/redfish-core/schema/dmtf/json-schema/CXLLogicalDevice.v1_2_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/CXLLogicalDevice.v1_2_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/CXLLogicalDevice.v1_2_1.json",
     "$ref": "#/definitions/CXLLogicalDevice",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -109,8 +109,8 @@
                     "versionAdded": "v1_1_0"
                 },
                 "MemorySizeMiB": {
-                    "description": "The memory region size defined in this CXL logical device.",
-                    "longDescription": "This property shall contain the memory region size defined in this CXL logical device in mebibytes (MiB).",
+                    "description": "The total memory capacity currently available in this CXL logical device.",
+                    "longDescription": "This property shall contain the total memory capacity currently available in this CXL logical device in mebibytes (MiB).  This value shall equate to the sum of the dynamic capacity extents and the static capacity assigned to this logical device.",
                     "readonly": true,
                     "type": "integer",
                     "units": "MiBy"
@@ -363,5 +363,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2024.1",
-    "title": "#CXLLogicalDevice.v1_2_0.CXLLogicalDevice"
+    "title": "#CXLLogicalDevice.v1_2_1.CXLLogicalDevice"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Certificate.v1_8_3.json b/redfish-core/schema/dmtf/json-schema/Certificate.v1_9_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Certificate.v1_8_3.json
rename to redfish-core/schema/dmtf/json-schema/Certificate.v1_9_0.json
index 540a38a..5ddf3f2 100644
--- a/redfish-core/schema/dmtf/json-schema/Certificate.v1_8_3.json
+++ b/redfish-core/schema/dmtf/json-schema/Certificate.v1_9_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Certificate.v1_8_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Certificate.v1_9_0.json",
     "$ref": "#/definitions/Certificate",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -253,11 +253,13 @@
                 "IDevID",
                 "LDevID",
                 "IAK",
-                "LAK"
+                "LAK",
+                "EK"
             ],
             "enumDescriptions": {
                 "BIOS": "This certificate is a BIOS certificate like those associated with UEFI.",
                 "Device": "This certificate is a device type certificate like those associated with SPDM and other standards.",
+                "EK": "This certificate is an EK certificate like those associated with TCG TPMs.",
                 "IAK": "This certificate is an IAK certificate like those associated with TCG TPMs.",
                 "IDevID": "This certificate is an IDevID certificate like those associated with TCG TPMs.",
                 "LAK": "This certificate is an LAK certificate like those associated with TCG TPMs.",
@@ -268,6 +270,7 @@
                 "Web": "This certificate is a web or HTTPS certificate like those used for event destinations."
             },
             "enumVersionAdded": {
+                "EK": "v1_9_0",
                 "IAK": "v1_8_0",
                 "IDevID": "v1_8_0",
                 "LAK": "v1_8_0",
@@ -693,6 +696,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.2",
-    "title": "#Certificate.v1_8_3.Certificate"
+    "release": "2024.3",
+    "title": "#Certificate.v1_9_0.Certificate"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Chassis.v1_25_1.json b/redfish-core/schema/dmtf/json-schema/Chassis.v1_25_2.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/Chassis.v1_25_1.json
rename to redfish-core/schema/dmtf/json-schema/Chassis.v1_25_2.json
index bdfe1db..6c7ca83 100644
--- a/redfish-core/schema/dmtf/json-schema/Chassis.v1_25_1.json
+++ b/redfish-core/schema/dmtf/json-schema/Chassis.v1_25_2.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Chassis.v1_25_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Chassis.v1_25_2.json",
     "$ref": "#/definitions/Chassis",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -171,7 +171,7 @@
                 "EnvironmentMetrics": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.json#/definitions/EnvironmentMetrics",
                     "description": "The link to the environment metrics for this chassis.",
-                    "longDescription": "This property shall contain a link to a resource of type `EnvironmentMetrics` that specifies the environment metrics for this chassis.",
+                    "longDescription": "This property shall contain a link to a resource of type `EnvironmentMetrics` that specifies the environment metrics for this chassis, all containing chassis, and devices contained by any of these chassis instances.  When determining power and energy readings, care should be taken to ensure any reported values do not overlap or result in double-counting.",
                     "readonly": true,
                     "versionAdded": "v1_15_0"
                 },
@@ -1302,5 +1302,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.3",
-    "title": "#Chassis.v1_25_1.Chassis"
+    "title": "#Chassis.v1_25_2.Chassis"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ComponentIntegrity.v1_2_3.json b/redfish-core/schema/dmtf/json-schema/ComponentIntegrity.v1_3_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/ComponentIntegrity.v1_2_3.json
rename to redfish-core/schema/dmtf/json-schema/ComponentIntegrity.v1_3_0.json
index 5c0d781..8c1b5ed 100644
--- a/redfish-core/schema/dmtf/json-schema/ComponentIntegrity.v1_2_3.json
+++ b/redfish-core/schema/dmtf/json-schema/ComponentIntegrity.v1_3_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ComponentIntegrity.v1_2_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ComponentIntegrity.v1_3_0.json",
     "$ref": "#/definitions/ComponentIntegrity",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -246,18 +246,28 @@
             "enum": [
                 "SPDM",
                 "TPM",
+                "TCM",
+                "TPCM",
                 "OEM"
             ],
             "enumDescriptions": {
                 "OEM": "OEM-specific.",
                 "SPDM": "Security Protocol and Data Model (SPDM) protocol.",
+                "TCM": "Trusted Cryptography Module (TCM).",
+                "TPCM": "Trusted Platform Control Module (TPCM).",
                 "TPM": "Trusted Platform Module (TPM)."
             },
             "enumLongDescriptions": {
                 "OEM": "This value shall indicate the integrity information is OEM-specific and the OEM section may include additional information.",
                 "SPDM": "This value shall indicate the integrity information is obtained through the Security Protocol and Data Model (SPDM) protocol as defined in DMTF DSP0274.",
+                "TCM": "This value shall indicate the integrity information is related to a Trusted Cryptography Module (TCM) as defined by the China TCM Union (TCMU).",
+                "TPCM": "This value shall indicate the integrity information is related to a Trusted Platform Control Module (TPCM) as defined by the Zhongguancun Trusted Computing Industry Alliance (ZTCIA).",
                 "TPM": "This value shall indicate the integrity information is related to a Trusted Platform Module (TPM) as defined by the Trusted Computing Group (TCG)."
             },
+            "enumVersionAdded": {
+                "TCM": "v1_3_0",
+                "TPCM": "v1_3_0"
+            },
             "type": "string"
         },
         "DMTFmeasurementTypes": {
@@ -1306,6 +1316,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2022.2",
-    "title": "#ComponentIntegrity.v1_2_3.ComponentIntegrity"
+    "release": "2024.3",
+    "title": "#ComponentIntegrity.v1_3_0.ComponentIntegrity"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_2.json b/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_23_0.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_2.json
rename to redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_23_0.json
index b6cde0e..1b5ed97 100644
--- a/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_2.json
+++ b/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_23_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_22_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_23_0.json",
     "$ref": "#/definitions/ComputerSystem",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -748,6 +748,13 @@
                     "longDescription": "This property shall contain the key management settings of the computer system.",
                     "versionAdded": "v1_16_0"
                 },
+                "LastResetCause": {
+                    "$ref": "#/definitions/LastResetCauses",
+                    "description": "The last reset cause of the system.",
+                    "longDescription": "This property shall contain the cause when the system last came out of a reset or was rebooted.",
+                    "readonly": true,
+                    "versionAdded": "v1_23_0"
+                },
                 "LastResetTime": {
                     "description": "The date and time when the system was last reset or rebooted.",
                     "format": "date-time",
@@ -1648,6 +1655,45 @@
             },
             "type": "object"
         },
+        "LastResetCauses": {
+            "enum": [
+                "PowerButtonPress",
+                "ManagementCommand",
+                "PowerRestorePolicy",
+                "RTCWakeup",
+                "WatchdogExpiration",
+                "OSSoftRestart",
+                "SystemCrash",
+                "ThermalEvent",
+                "PowerEvent",
+                "Unknown"
+            ],
+            "enumDescriptions": {
+                "ManagementCommand": "System start or restart via an external command to the management controller or BMC.",
+                "OSSoftRestart": "System start or restart via an OS soft restart.",
+                "PowerButtonPress": "System start or restart via a power button press.",
+                "PowerEvent": "System start or restart caused by a power event triggering a system shutdown.",
+                "PowerRestorePolicy": "System start or restart due to the power restore policy.",
+                "RTCWakeup": "System power-up via an RTC (system real time clock) wakeup.",
+                "SystemCrash": "System start or restart caused by a system crash.",
+                "ThermalEvent": "System start or restart caused by a thermal event triggering a system shutdown.",
+                "Unknown": "System start or restart detected, but the cause is unknown.",
+                "WatchdogExpiration": "System start or restart caused by a watchdog expiration."
+            },
+            "enumLongDescriptions": {
+                "ManagementCommand": "This value shall indicate the system start or restart was due to an external command to the management controller or BMC.  Examples include the Redfish `Reset` action for the `ComputerSystem` resource or the IPMI 'Chassis Control' command.",
+                "OSSoftRestart": "This value shall indicate the system start or restart was due to an OS soft restart.  Examples include 'CTRL-ALT-DEL', 'init 6', or 'reboot'.",
+                "PowerButtonPress": "This value shall indicate the system start or restart was due to a power button press.",
+                "PowerEvent": "This value shall indicate the system start or restart was caused by a power event triggering a system shutdown.",
+                "PowerRestorePolicy": "This value shall indicate the system automatically powered-up on AC being applied due the `PowerRestorePolicy` property containing `AlwaysOn` or `LastState`.",
+                "RTCWakeup": "This value shall indicate the system powered-up via an RTC (system real time clock) wakeup.",
+                "SystemCrash": "This value shall indicate the system start or restart was caused by a system crash.  Examples include an OS panic, hardware fault, or firmware fault.",
+                "ThermalEvent": "This value shall indicate the system start or restart was caused by a thermal event triggering a system shutdown.",
+                "Unknown": "This value shall indicate the system start or restart cause is unknown.",
+                "WatchdogExpiration": "This value shall indicate the system start or restart was caused by a watchdog expiration."
+            },
+            "type": "string"
+        },
         "Links": {
             "additionalProperties": false,
             "description": "The links to other resources that are related to this resource.",
@@ -2569,6 +2615,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#ComputerSystem.v1_22_2.ComputerSystem"
+    "release": "2024.3",
+    "title": "#ComputerSystem.v1_23_0.ComputerSystem"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Control.v1_5_1.json b/redfish-core/schema/dmtf/json-schema/Control.v1_5_2.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Control.v1_5_1.json
rename to redfish-core/schema/dmtf/json-schema/Control.v1_5_2.json
index b873297..d5731c3 100644
--- a/redfish-core/schema/dmtf/json-schema/Control.v1_5_1.json
+++ b/redfish-core/schema/dmtf/json-schema/Control.v1_5_2.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Control.v1_5_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Control.v1_5_2.json",
     "$ref": "#/definitions/Control",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -325,8 +325,8 @@
                     "readonly": true
                 },
                 "SetPointUnits": {
-                    "description": "The units of the set point.",
-                    "longDescription": "This property shall contain the units of the control's set point.",
+                    "description": "The units of the set point and related properties in UCUM c/s format.",
+                    "longDescription": "This property shall contain the units of the control's set point and related properties.  The value shall follow the case-sensitive symbol format defined by the Unified Code for Units of Measure (UCUM), as specified by the 'Units of measure annotation' clause of the Redfish Specification.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1012,5 +1012,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.3",
-    "title": "#Control.v1_5_1.Control"
+    "title": "#Control.v1_5_2.Control"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Drive.v1_20_0.json b/redfish-core/schema/dmtf/json-schema/Drive.v1_20_1.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/Drive.v1_20_0.json
rename to redfish-core/schema/dmtf/json-schema/Drive.v1_20_1.json
index 4658b9c..a8c8807 100644
--- a/redfish-core/schema/dmtf/json-schema/Drive.v1_20_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Drive.v1_20_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Drive.v1_20_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Drive.v1_20_1.json",
     "$ref": "#/definitions/Drive",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -1287,5 +1287,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2024.2",
-    "title": "#Drive.v1_20_0.Drive"
+    "title": "#Drive.v1_20_1.Drive"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Event.v1_10_1.json b/redfish-core/schema/dmtf/json-schema/Event.v1_11_0.json
similarity index 95%
rename from redfish-core/schema/dmtf/json-schema/Event.v1_10_1.json
rename to redfish-core/schema/dmtf/json-schema/Event.v1_11_0.json
index 3b35278..1aa0454 100644
--- a/redfish-core/schema/dmtf/json-schema/Event.v1_10_1.json
+++ b/redfish-core/schema/dmtf/json-schema/Event.v1_11_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Event.v1_10_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Event.v1_11_0.json",
     "$ref": "#/definitions/Event",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -392,6 +392,26 @@
                     "readonly": true,
                     "type": "boolean",
                     "versionAdded": "v1_6_0"
+                },
+                "UserAuthenticationSource": {
+                    "description": "The source of authentication for the username property associated with the event record.",
+                    "longDescription": "This property shall contain the URL to the authentication service that is associated with the username property.  This should be used for events that result from a user action.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_11_0"
+                },
+                "Username": {
+                    "description": "The username of the account associated with the event record.",
+                    "longDescription": "This property shall contain the username of the account associated with the event record.  This should be used for events that result from a user action.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_11_0"
                 }
             },
             "required": [
@@ -474,6 +494,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#Event.v1_10_1.Event"
+    "release": "2024.3",
+    "title": "#Event.v1_11_0.Event"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/EventDestination.v1_14_1.json b/redfish-core/schema/dmtf/json-schema/EventDestination.v1_15_0.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/EventDestination.v1_14_1.json
rename to redfish-core/schema/dmtf/json-schema/EventDestination.v1_15_0.json
index 5e4707b..d261e7f 100644
--- a/redfish-core/schema/dmtf/json-schema/EventDestination.v1_14_1.json
+++ b/redfish-core/schema/dmtf/json-schema/EventDestination.v1_15_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/EventDestination.v1_14_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EventDestination.v1_15_0.json",
     "$ref": "#/definitions/EventDestination",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -99,6 +99,20 @@
                     "longDescription": "This property shall contain the available actions for this resource.",
                     "versionAdded": "v1_2_0"
                 },
+                "BackupDestinations": {
+                    "description": "The backup destination URIs for this event receiver.  Events are sent to these URIs, in array order, when the destination URI is unreachable or returns an error.",
+                    "format": "uri-reference",
+                    "items": {
+                        "type": [
+                            "string",
+                            "null"
+                        ]
+                    },
+                    "longDescription": "This property shall contain an array of URIs to destination where events are sent if the event receiver specified by `Destination` is unreachable or returns an error.  Events are sent to each of the backup destinations, in array order, until a destination has been reached.  An empty array shall indicate that the service supports backup event receivers, but none have been specified by the user.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_15_0"
+                },
                 "Certificates": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
                     "description": "The link to a collection of server certificates for the server referenced by the `Destination` property.",
@@ -664,8 +678,8 @@
             "properties": {
                 "AuthenticationKey": {
                     "description": "The secret authentication key for SNMPv3.",
-                    "longDescription": "This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark.",
-                    "pattern": "(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\\*+$)",
+                    "longDescription": "This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.",
+                    "pattern": "(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{24,96}$)|(^\\*+$)",
                     "readonly": false,
                     "type": [
                         "string",
@@ -697,8 +711,8 @@
                 },
                 "EncryptionKey": {
                     "description": "The secret authentication key for SNMPv3.",
-                    "longDescription": "This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark.",
-                    "pattern": "(^[A-Za-z0-9]+$)|(^\\*+$)",
+                    "longDescription": "This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.",
+                    "pattern": "(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{16,64}$)|(^\\*+$)",
                     "readonly": false,
                     "type": [
                         "string",
@@ -946,6 +960,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#EventDestination.v1_14_1.EventDestination"
+    "release": "2024.3",
+    "title": "#EventDestination.v1_15_0.EventDestination"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ExternalAccountProvider.v1_7_2.json b/redfish-core/schema/dmtf/json-schema/ExternalAccountProvider.v1_8_0.json
similarity index 95%
rename from redfish-core/schema/dmtf/json-schema/ExternalAccountProvider.v1_7_2.json
rename to redfish-core/schema/dmtf/json-schema/ExternalAccountProvider.v1_8_0.json
index bf571aa..65210ce 100644
--- a/redfish-core/schema/dmtf/json-schema/ExternalAccountProvider.v1_7_2.json
+++ b/redfish-core/schema/dmtf/json-schema/ExternalAccountProvider.v1_8_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ExternalAccountProvider.v1_7_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ExternalAccountProvider.v1_8_0.json",
     "$ref": "#/definitions/ExternalAccountProvider",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -634,6 +634,36 @@
                 }
             },
             "properties": {
+                "LocalAccountTypes": {
+                    "description": "The list of local services in the manager that the remote user or group is allowed to access.",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.json#/definitions/AccountTypes"
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
+                    },
+                    "longDescription": "This property shall contain an array of the various local manager services that the remote user or group is allowed to access.  This shall not include functionality for receiving events or other notifications.  If this property is not supported, the value shall be assumed to be an array that contains the value `Redfish`.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_8_0"
+                },
+                "LocalOEMAccountTypes": {
+                    "description": "The OEM account types for the remote user or group.",
+                    "items": {
+                        "type": [
+                            "string",
+                            "null"
+                        ]
+                    },
+                    "longDescription": "This property shall contain an array of the OEM account types for the remote user or group when `LocalAccountTypes` contains `OEM`.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_8_0"
+                },
                 "LocalRole": {
                     "description": "The name of the local Redfish role to which to map the remote user or group.",
                     "longDescription": "This property shall contain the `RoleId` property value within a role resource on this Redfish service to which to map the remote user or group.",
@@ -771,6 +801,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.2",
-    "title": "#ExternalAccountProvider.v1_7_2.ExternalAccountProvider"
+    "release": "2024.3",
+    "title": "#ExternalAccountProvider.v1_8_0.ExternalAccountProvider"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/LeakDetection.v1_0_1.json b/redfish-core/schema/dmtf/json-schema/LeakDetection.v1_1_0.json
similarity index 94%
rename from redfish-core/schema/dmtf/json-schema/LeakDetection.v1_0_1.json
rename to redfish-core/schema/dmtf/json-schema/LeakDetection.v1_1_0.json
index 50b3d98..1402282 100644
--- a/redfish-core/schema/dmtf/json-schema/LeakDetection.v1_0_1.json
+++ b/redfish-core/schema/dmtf/json-schema/LeakDetection.v1_1_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/LeakDetection.v1_0_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/LeakDetection.v1_1_0.json",
     "$ref": "#/definitions/LeakDetection",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -168,8 +168,17 @@
                     "description": "Humidity (percent).",
                     "excerptCopy": "SensorExcerpt",
                     "longDescription": "This property shall contain the humidity, in percent units, for this resource.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Humidity`."
+                },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of the resource and its subordinate or dependent resources.",
+                    "longDescription": "This property shall contain any status or health properties of the resource.",
+                    "versionAdded": "v1_1_0"
                 }
             },
+            "required": [
+                "Status"
+            ],
             "type": "object"
         },
         "OemActions": {
@@ -196,6 +205,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.1",
-    "title": "#LeakDetection.v1_0_1.LeakDetection"
+    "release": "2024.3",
+    "title": "#LeakDetection.v1_1_0.LeakDetection"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_1_0.json b/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_2_0.json
similarity index 93%
rename from redfish-core/schema/dmtf/json-schema/LeakDetector.v1_1_0.json
rename to redfish-core/schema/dmtf/json-schema/LeakDetector.v1_2_0.json
index e4c6741..beb3851 100644
--- a/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_1_0.json
+++ b/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_2_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/LeakDetector.v1_1_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/LeakDetector.v1_2_0.json",
     "$ref": "#/definitions/LeakDetector",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -89,7 +89,7 @@
                     ],
                     "description": "The state of the leak detector.",
                     "excerpt": "LeakDetector",
-                    "longDescription": "This property shall contain the state of the leak detector.",
+                    "longDescription": "This property shall contain the state of the leak detector.  The value of this property should equate the value of `Health` in `Status`, and was created primarily for use in excerpts of this resource.",
                     "readonly": true
                 },
                 "Id": {
@@ -277,9 +277,21 @@
                     ],
                     "description": "The state of the leak detector.",
                     "excerpt": "LeakDetector",
-                    "longDescription": "This property shall contain the state of the leak detector.",
+                    "longDescription": "This property shall contain the state of the leak detector.  The value of this property should equate the value of `Health` in `Status`, and was created primarily for use in excerpts of this resource.",
                     "readonly": true
                 },
+                "DeviceName": {
+                    "description": "The name of the device.",
+                    "excerpt": "LeakDetectorArray",
+                    "excerptCopyOnly": true,
+                    "longDescription": "This property shall contain the name of the device associated with this leak detector.  If the device is represented by a resource, the value shall contain the value of the `Name` property of the associated resource.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_2_0"
+                },
                 "PhysicalContext": {
                     "anyOf": [
                         {
@@ -353,7 +365,7 @@
                     ],
                     "description": "The state of the leak detector.",
                     "excerpt": "LeakDetector",
-                    "longDescription": "This property shall contain the state of the leak detector.",
+                    "longDescription": "This property shall contain the state of the leak detector.  The value of this property should equate the value of `Health` in `Status`, and was created primarily for use in excerpts of this resource.",
                     "readonly": true
                 }
             },
@@ -394,6 +406,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#LeakDetector.v1_1_0.LeakDetector"
+    "release": "2024.3",
+    "title": "#LeakDetector.v1_2_0.LeakDetector"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_2.json b/redfish-core/schema/dmtf/json-schema/LogEntry.v1_17_0.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_2.json
rename to redfish-core/schema/dmtf/json-schema/LogEntry.v1_17_0.json
index 0ae4c39..33e2d7f 100644
--- a/redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_2.json
+++ b/redfish-core/schema/dmtf/json-schema/LogEntry.v1_17_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/LogEntry.v1_16_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/LogEntry.v1_17_0.json",
     "$ref": "#/definitions/LogEntry",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -586,6 +586,26 @@
                     "readonly": true,
                     "type": "boolean",
                     "versionAdded": "v1_13_0"
+                },
+                "UserAuthenticationSource": {
+                    "description": "The source of authentication for the username property associated with the log entry.",
+                    "longDescription": "This property shall contain the URL to the authentication service that is associated with the username property.  This should be used for audit logs that result from a user action.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_17_0"
+                },
+                "Username": {
+                    "description": "The username of the account associated with the log entry.",
+                    "longDescription": "This property shall contain the username of the account associated with the log entry.  This should be used for audit logs that result from a user action.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_17_0"
                 }
             },
             "required": [
@@ -883,6 +903,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#LogEntry.v1_16_2.LogEntry"
+    "release": "2024.3",
+    "title": "#LogEntry.v1_17_0.LogEntry"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Manager.v1_19_1.json b/redfish-core/schema/dmtf/json-schema/Manager.v1_19_2.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Manager.v1_19_1.json
rename to redfish-core/schema/dmtf/json-schema/Manager.v1_19_2.json
index d44e64b..f75c896 100644
--- a/redfish-core/schema/dmtf/json-schema/Manager.v1_19_1.json
+++ b/redfish-core/schema/dmtf/json-schema/Manager.v1_19_2.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Manager.v1_19_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Manager.v1_19_2.json",
     "$ref": "#/definitions/Manager",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -437,8 +437,8 @@
                 },
                 "CommandShell": {
                     "$ref": "#/definitions/CommandShell",
-                    "description": "The command shell service that this manager provides.",
-                    "longDescription": "This property shall contain information about the command shell service of this manager."
+                    "description": "The manager's command line user interface or command shell service.",
+                    "longDescription": "This property shall describe a command line user interface or command shell service provided by this manager.  The command shell refers to an interface used to interact with the manager itself, not a dedicated console session redirected from a host operating system.  For redirected serial or host operating system consoles, see the `SerialConsole` property in the `ComputerSystem` resource."
                 },
                 "DateTime": {
                     "description": "The current date and time with UTC offset of the manager.",
@@ -500,8 +500,8 @@
                 },
                 "GraphicalConsole": {
                     "$ref": "#/definitions/GraphicalConsole",
-                    "description": "The information about the graphical console service of this manager.",
-                    "longDescription": "This property shall contain the information about the graphical console (KVM-IP) service of this manager.  This property should be used to describe a service for the manager's console or operating system, not a service provided on behalf of a host operating system.  Implementations representing host OS consoles, known generally as a KVM-IP feature, should use the `GraphicalConsole` property in ComputerSystem."
+                    "description": "The manager's graphical console service.",
+                    "longDescription": "This property shall contain the information about the graphical console (KVM-IP) service of this manager.  This property should be used to describe a service for the manager's console or operating system, not a service provided on behalf of a host operating system.  Implementations representing host OS consoles, known generally as a KVM-IP feature, should use the `GraphicalConsole` property in the `ComputerSystem` resource."
                 },
                 "HostInterfaces": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/HostInterfaceCollection.json#/definitions/HostInterfaceCollection",
@@ -1082,5 +1082,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.3",
-    "title": "#Manager.v1_19_1.Manager"
+    "title": "#Manager.v1_19_2.Manager"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_12_1.json b/redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_13_0.json
similarity index 80%
rename from redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_12_1.json
rename to redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_13_0.json
index 8d876e9..9a363a6 100644
--- a/redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_12_1.json
+++ b/redfish-core/schema/dmtf/json-schema/ManagerAccount.v1_13_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_12_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_13_0.json",
     "$ref": "#/definitions/ManagerAccount",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -26,6 +26,15 @@
                 "#ManagerAccount.ChangePassword": {
                     "$ref": "#/definitions/ChangePassword"
                 },
+                "#ManagerAccount.ClearSecretKey": {
+                    "$ref": "#/definitions/ClearSecretKey"
+                },
+                "#ManagerAccount.GenerateSecretKey": {
+                    "$ref": "#/definitions/GenerateSecretKey"
+                },
+                "#ManagerAccount.VerifyTimeBasedOneTimePassword": {
+                    "$ref": "#/definitions/VerifyTimeBasedOneTimePassword"
+                },
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
                     "description": "The available OEM-specific actions for this resource.",
@@ -81,6 +90,104 @@
             "type": "object",
             "versionAdded": "v1_11_0"
         },
+        "ClearSecretKey": {
+            "additionalProperties": false,
+            "description": "This action clears the secret key for Time-based One-Time Password (TOTP) multi-factor authentication for this account.",
+            "longDescription": "This action shall clear the secret key for RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication for this account.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_13_0"
+        },
+        "GenerateSecretKey": {
+            "actionResponse": {
+                "$ref": "#/definitions/GenerateSecretKeyResponse"
+            },
+            "additionalProperties": false,
+            "description": "This action randomly generates a new secret key for Time-based One-Time Password (TOTP) multi-factor authentication for this account.",
+            "longDescription": "This action shall randomly generate a new secret key for RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication for this account.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_13_0"
+        },
+        "GenerateSecretKeyResponse": {
+            "additionalProperties": false,
+            "description": "The response body for the `GenerateSecretKey` action.",
+            "longDescription": "This type shall contain the properties found in the response body for the `GenerateSecretKey` action.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "SecretKey": {
+                    "description": "The secret key generated for Time-based One-Time Password (TOTP) multi-factor authentication.",
+                    "longDescription": "This property shall contain secret key generated for RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication.  Clients shall retain the value of this property to generate tokens for future session creation requests.",
+                    "readonly": true,
+                    "type": "string",
+                    "versionAdded": "v1_13_0"
+                }
+            },
+            "type": "object"
+        },
         "Links": {
             "additionalProperties": false,
             "description": "The links to other resources that are related to this resource.",
@@ -347,6 +454,13 @@
                     "longDescription": "This property shall contain the SNMP settings for this account when `AccountTypes` contains `SNMP`.",
                     "versionAdded": "v1_4_0"
                 },
+                "SecretKeySet": {
+                    "description": "Indicates if the secret key for Time-based One-Time Password (TOTP) multi-factor authentication is set.",
+                    "longDescription": "This property shall indicate if the secret key for RFC6238-defined Time-based One-Time Password (TOTP) multi-factor authentication is set.",
+                    "readonly": true,
+                    "type": "boolean",
+                    "versionAdded": "v1_13_0"
+                },
                 "StrictAccountTypes": {
                     "description": "Indicates if the service needs to use the account types exactly as specified when the account is created or updated.",
                     "longDescription": "This property shall indicate if the service needs to use the value of `AccountTypes` and `OEMAccountTypes` values exactly as specified.  A `true` value shall indicate the service needs to either accept the value without changes or reject the request.  A `false` value shall indicate the service may add additional `AccountTypes` and `OEMAccountTypes` values as needed to support limitations it has in separately controlling access to individual services.  If this property is not present, the value shall be assumed to be `false`.  An update of the service can cause account types to be added to or removed from the `AccountTypes` and `OEMAccountTypes` properties, regardless of the value of this property.  After a service update, clients should inspect all accounts where the value of this property is `true` and perform maintenance as needed.",
@@ -484,8 +598,8 @@
             "properties": {
                 "AuthenticationKey": {
                     "description": "The secret authentication key for SNMPv3.",
-                    "longDescription": "This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark.",
-                    "pattern": "(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\\*+$)",
+                    "longDescription": "This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.",
+                    "pattern": "(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\\*+$)",
                     "readonly": false,
                     "type": [
                         "string",
@@ -517,8 +631,8 @@
                 },
                 "EncryptionKey": {
                     "description": "The secret encryption key used in SNMPv3.",
-                    "longDescription": "This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark.",
-                    "pattern": "(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{32})|(^\\*+$)",
+                    "longDescription": "This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.",
+                    "pattern": "(^[ -~]+$)|(^Passphrase:[ -~]+$)|(^Hex:[0-9A-Fa-f]{16,64}$)|(^\\*+$)",
                     "readonly": false,
                     "type": [
                         "string",
@@ -550,10 +664,50 @@
                 }
             },
             "type": "object"
+        },
+        "VerifyTimeBasedOneTimePassword": {
+            "additionalProperties": false,
+            "description": "This action verifies a user-provided Time-based One-Time Password (TOTP).  This is to ensure the client's copy of the secret key is aligned with the secret key stored by the service.",
+            "longDescription": "This action shall verify a user-provided RFC6238-defined Time-based One-Time Password (TOTP).",
+            "parameters": {
+                "TimeBasedOneTimePassword": {
+                    "description": "The Time-based One-Time Password (TOTP) to verify.",
+                    "longDescription": "This parameter shall contain the Time-based One-Time Password (TOTP) to verify.  If the Time-based One-Time Password (TOTP) is not valid, the service shall return the HTTP `400 Bad Request` status code.",
+                    "requiredParameter": true,
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_13_0"
         }
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#ManagerAccount.v1_12_1.ManagerAccount"
+    "release": "2024.3",
+    "title": "#ManagerAccount.v1_13_0.ManagerAccount"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Message.v1_2_1.json b/redfish-core/schema/dmtf/json-schema/Message.v1_3_0.json
similarity index 82%
rename from redfish-core/schema/dmtf/json-schema/Message.v1_2_1.json
rename to redfish-core/schema/dmtf/json-schema/Message.v1_3_0.json
index f109451..b27a8fe 100644
--- a/redfish-core/schema/dmtf/json-schema/Message.v1_2_1.json
+++ b/redfish-core/schema/dmtf/json-schema/Message.v1_3_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Message.v1_2_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Message.v1_3_0.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
@@ -86,6 +86,26 @@
                     "readonly": true,
                     "type": "string",
                     "versionDeprecated": "v1_1_0"
+                },
+                "UserAuthenticationSource": {
+                    "description": "The source of authentication for the username property associated with the message.",
+                    "longDescription": "This property shall contain the URL to the authentication service that is associated with the username property.  This should be used for messages that result from a user action.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_3_0"
+                },
+                "Username": {
+                    "description": "The username of the account associated with the message.",
+                    "longDescription": "This property shall contain the username of the account associated with the message.  This should be used for messages that result from a user action.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_3_0"
                 }
             },
             "required": [
@@ -96,6 +116,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#Message.v1_2_1"
+    "release": "2024.3",
+    "title": "#Message.v1_3_0"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_15_0.json b/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_16_0.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_15_0.json
rename to redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_16_0.json
index 7609080..441dfea 100644
--- a/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_15_0.json
+++ b/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_16_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_15_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_16_0.json",
     "$ref": "#/definitions/PCIeDevice",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -1108,6 +1108,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.2",
-    "title": "#PCIeDevice.v1_15_0.PCIeDevice"
+    "release": "2024.3",
+    "title": "#PCIeDevice.v1_16_0.PCIeDevice"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/PhysicalContext.json b/redfish-core/schema/dmtf/json-schema/PhysicalContext.json
index cc43e17..2589350 100644
--- a/redfish-core/schema/dmtf/json-schema/PhysicalContext.json
+++ b/redfish-core/schema/dmtf/json-schema/PhysicalContext.json
@@ -48,7 +48,9 @@
                 "VoltageRegulator",
                 "Rectifier",
                 "StorageDevice",
+                "StorageSubsystem",
                 "NetworkingDevice",
+                "ExpansionSubsystem",
                 "ComputeBay",
                 "StorageBay",
                 "NetworkBay",
@@ -67,6 +69,7 @@
                 "DCBus",
                 "ACOutput",
                 "ACInput",
+                "PowerOutlet",
                 "TrustedModule",
                 "Board",
                 "Transceiver",
@@ -78,11 +81,11 @@
                 "Manager"
             ],
             "enumDescriptions": {
-                "ACInput": "An AC input.",
-                "ACMaintenanceBypassInput": "An AC maintenance bypass input.",
-                "ACOutput": "An AC output.",
-                "ACStaticBypassInput": "An AC static bypass input.",
-                "ACUtilityInput": "An AC utility input.",
+                "ACInput": "An AC electrical input or input-related circuit.",
+                "ACMaintenanceBypassInput": "An AC electrical maintenance bypass input.",
+                "ACOutput": "An AC electrical output or output-related circuit.",
+                "ACStaticBypassInput": "An AC electrical static bypass input.",
+                "ACUtilityInput": "An AC electrical utility input.",
                 "ASIC": "An ASIC device, such as a networking chip or chipset component.",
                 "Accelerator": "An accelerator.",
                 "Back": "The back of the chassis.",
@@ -92,11 +95,12 @@
                 "CPU": "A processor (CPU).",
                 "CPUSubsystem": "The entire processor (CPU) subsystem.",
                 "Chassis": "The entire chassis.",
-                "ComputeBay": "Within a compute bay.",
+                "ComputeBay": "A compute bay.",
                 "CoolingSubsystem": "The entire cooling, or air and liquid, subsystem.",
-                "DCBus": "A DC bus.",
+                "DCBus": "A DC electrical bus.",
                 "Exhaust": "The air exhaust point or points or region of the chassis.",
-                "ExpansionBay": "Within an expansion bay.",
+                "ExpansionBay": "An expansion bay.",
+                "ExpansionSubsystem": "A group of expansion bays.",
                 "FPGA": "An FPGA.",
                 "Fan": "A fan.",
                 "Filter": "A filter.",
@@ -111,17 +115,19 @@
                 "Memory": "A memory device.",
                 "MemorySubsystem": "The entire memory subsystem.",
                 "Motor": "A motor.",
-                "NetworkBay": "Within a networking bay.",
+                "NetworkBay": "A networking bay.",
                 "NetworkingDevice": "A networking device.",
+                "PowerOutlet": "An electrical outlet.",
                 "PowerSubsystem": "The entire power subsystem.",
                 "PowerSupply": "A power supply.",
-                "PowerSupplyBay": "Within a power supply bay.",
+                "PowerSupplyBay": "A power supply bay.",
                 "Pump": "A pump.",
                 "Rectifier": "A rectifier device.",
                 "Reservoir": "A reservoir.",
                 "Room": "The room.",
-                "StorageBay": "Within a storage bay.",
+                "StorageBay": "A storage bay.",
                 "StorageDevice": "A storage device.",
+                "StorageSubsystem": "A storage subsystem.",
                 "Switch": "A switch device.",
                 "SystemBoard": "The system board (PCB).",
                 "Transceiver": "A transceiver.",
@@ -131,7 +137,16 @@
                 "VoltageRegulator": "A voltage regulator device."
             },
             "enumLongDescriptions": {
+                "ACOutput": "This value shall indicate an electrical output or an output-related circuit, such as a branch output, which is not terminated as a power outlet.",
+                "ACUtilityInput": "This value shall indicate an electrical input, where the source is an electrical utility as opposed to a backup or locally-generated power source.  This value is intended to differentiate multiple electrical inputs between utility, maintenance bypass, or static bypass values.  For general purpose usage, the value of `ACInput` is preferred.",
                 "Board": "This value shall indicate a circuit board that is not the primary or system board within a context that cannot be described by other defined values.",
+                "ExpansionBay": "This value shall indicate a location that provides for the expansion of functionality of a system, such as a PCIe slot that can accept an option card.",
+                "ExpansionSubsystem": "This value shall indicate a group of expansion bays and the devices installed in those bays.",
+                "NetworkBay": "This value shall indicate a location that provides for the expansion of networking functionality of a system, by the addition of networking devices.",
+                "PowerOutlet": "This value shall indicate an electrical outlet or receptacle.",
+                "PowerSupplyBay": "This value shall indicate a location that provides for the installation of a power supply or similar devices.",
+                "StorageBay": "This value shall indicate a location that provides for the expansion of storage functionality of a system, by the addition of storage devices.",
+                "StorageSubsystem": "This value shall indicate a storage subsystem, which may consist of one or more storage controllers, storage devices, or related components.",
                 "Transceiver": "This value shall indicate a transceiver attached to a device."
             },
             "enumVersionAdded": {
@@ -148,6 +163,7 @@
                 "Chassis": "2017.2",
                 "CoolingSubsystem": "2018.3",
                 "DCBus": "2018.3",
+                "ExpansionSubsystem": "2024.3",
                 "FPGA": "2018.3",
                 "Fan": "2017.2",
                 "Filter": "2024.2",
@@ -158,10 +174,12 @@
                 "Memory": "2017.1",
                 "MemorySubsystem": "2018.3",
                 "Motor": "2018.3",
+                "PowerOutlet": "2024.3",
                 "PowerSubsystem": "2019.1",
                 "Pump": "2021.3",
                 "Rectifier": "2019.1",
                 "Reservoir": "2024.2",
+                "StorageSubsystem": "2024.3",
                 "Switch": "2024.2",
                 "Transceiver": "2021.1",
                 "Transformer": "2018.3",
diff --git a/redfish-core/schema/dmtf/json-schema/Port.v1_13_0.json b/redfish-core/schema/dmtf/json-schema/Port.v1_14_0.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/Port.v1_13_0.json
rename to redfish-core/schema/dmtf/json-schema/Port.v1_14_0.json
index f653285..e3ff58e 100644
--- a/redfish-core/schema/dmtf/json-schema/Port.v1_13_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Port.v1_14_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Port.v1_13_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Port.v1_14_0.json",
     "$ref": "#/definitions/Port",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -2062,6 +2062,16 @@
                 }
             },
             "properties": {
+                "DateCode": {
+                    "description": "The manufacturing date code for this SFP.",
+                    "longDescription": "This property shall contain the manufacturing date code for this SFP as determined by the vendor or supplier.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_14_0"
+                },
                 "FiberConnectionType": {
                     "anyOf": [
                         {
@@ -2232,6 +2242,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.2",
-    "title": "#Port.v1_13_0.Port"
+    "release": "2024.3",
+    "title": "#Port.v1_14_0.Port"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/PortMetrics.v1_6_1.json b/redfish-core/schema/dmtf/json-schema/PortMetrics.v1_7_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/PortMetrics.v1_6_1.json
rename to redfish-core/schema/dmtf/json-schema/PortMetrics.v1_7_0.json
index 7ed542a..1144fe9 100644
--- a/redfish-core/schema/dmtf/json-schema/PortMetrics.v1_6_1.json
+++ b/redfish-core/schema/dmtf/json-schema/PortMetrics.v1_7_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/PortMetrics.v1_6_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/PortMetrics.v1_7_0.json",
     "$ref": "#/definitions/PortMetrics",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -1059,6 +1059,17 @@
                     ],
                     "units": "mW",
                     "versionAdded": "v1_1_0"
+                },
+                "WavelengthNanometers": {
+                    "description": "The laser wavelength, in nanometers, for a small form-factor pluggable (SFP) transceiver.",
+                    "longDescription": "This property shall contain the laser wavelength, in nanometers, for a small form-factor pluggable (SFP) transceiver.  This property shall not be present for non-optic SFP mediums.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "units": "nm",
+                    "versionAdded": "v1_7_0"
                 }
             },
             "type": "object"
@@ -1066,6 +1077,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#PortMetrics.v1_6_1.PortMetrics"
+    "release": "2024.3",
+    "title": "#PortMetrics.v1_7_0.PortMetrics"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Resource.v1_19_1.json b/redfish-core/schema/dmtf/json-schema/Resource.v1_20_0.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/Resource.v1_19_1.json
rename to redfish-core/schema/dmtf/json-schema/Resource.v1_20_0.json
index 4f7890c..7cbdc9a 100644
--- a/redfish-core/schema/dmtf/json-schema/Resource.v1_19_1.json
+++ b/redfish-core/schema/dmtf/json-schema/Resource.v1_20_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_19_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_20_0.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
@@ -1174,6 +1174,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#Resource.v1_19_1"
+    "release": "2024.3",
+    "title": "#Resource.v1_20_0"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Sensor.v1_10_0.json b/redfish-core/schema/dmtf/json-schema/Sensor.v1_10_1.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Sensor.v1_10_0.json
rename to redfish-core/schema/dmtf/json-schema/Sensor.v1_10_1.json
index e456216..2bc2868 100644
--- a/redfish-core/schema/dmtf/json-schema/Sensor.v1_10_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Sensor.v1_10_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_10_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_10_1.json",
     "$ref": "#/definitions/Sensor",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -474,7 +474,7 @@
                 },
                 "Enabled": {
                     "description": "Indicates whether the sensor is enabled and provides a reading.",
-                    "longDescription": "This property shall indicate whether the sensor is enabled and provides a `Reading`.  The value `true` shall indicate the sensor is enabled and returns the `Reading` property with a valid value.  The value `false` shall indicate the sensor is disabled, and shall not return the `Reading` property.",
+                    "longDescription": "This property shall indicate whether the sensor is enabled and provides a `Reading`.  The value `true` shall indicate the sensor is enabled and returns the `Reading` property with a valid value.  The value `false` shall indicate the sensor is disabled, shall not return the `Reading` property, and shall not trigger events, logging, or other functionality.  This property allows a user to disable a faulty sensor or to otherwise remove it from use.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -804,8 +804,8 @@
                     "readonly": true
                 },
                 "ReadingUnits": {
-                    "description": "The units of the reading and thresholds.",
-                    "longDescription": "This property shall contain the units of the sensor's reading and thresholds.",
+                    "description": "The units of the reading, thresholds, and other reading-related properties in UCUM c/s format.",
+                    "longDescription": "This property shall contain the units of the sensor's reading, thresholds, and other reading-related properties.  The value shall follow the case-sensitive symbol format defined by the Unified Code for Units of Measure (UCUM), as specified by the 'Units of measure annotation' clause of the Redfish Specification.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1909,5 +1909,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2024.2",
-    "title": "#Sensor.v1_10_0.Sensor"
+    "title": "#Sensor.v1_10_1.Sensor"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Storage.v1_17_0.json b/redfish-core/schema/dmtf/json-schema/Storage.v1_17_1.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/Storage.v1_17_0.json
rename to redfish-core/schema/dmtf/json-schema/Storage.v1_17_1.json
index be6c3a8..a512bba 100644
--- a/redfish-core/schema/dmtf/json-schema/Storage.v1_17_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Storage.v1_17_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_17_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_17_1.json",
     "$ref": "#/definitions/Storage",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -1323,5 +1323,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2024.2",
-    "title": "#Storage.v1_17_0.Storage"
+    "title": "#Storage.v1_17_1.Storage"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/StorageController.v1_7_3.json b/redfish-core/schema/dmtf/json-schema/StorageController.v1_8_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/StorageController.v1_7_3.json
rename to redfish-core/schema/dmtf/json-schema/StorageController.v1_8_0.json
index f5df7e2..f816671 100644
--- a/redfish-core/schema/dmtf/json-schema/StorageController.v1_7_3.json
+++ b/redfish-core/schema/dmtf/json-schema/StorageController.v1_8_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/StorageController.v1_7_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/StorageController.v1_8_0.json",
     "$ref": "#/definitions/StorageController",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -572,6 +572,17 @@
                     "longDescription": "This property shall contain the type of NVMe controller.",
                     "readonly": true
                 },
+                "MaxAttachedNamespaces": {
+                    "description": "The maximum number of attached namespaces allowed by this NVMe I/O controller.",
+                    "longDescription": "This property shall contain the maximum number of attached namespaces allowed by this NVMe I/O controller.",
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
                 "MaxQueueSize": {
                     "description": "The maximum individual queue size that an NVMe I/O controller supports.",
                     "longDescription": "This property shall contain the maximum individual queue entry size supported per queue.  This is a zero-based value, where the minimum value is one, indicating two entries.  For PCIe, this applies to both submission and completion queues.  For NVMe-oF, this applies only to submission queues.",
@@ -1186,6 +1197,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.1",
-    "title": "#StorageController.v1_7_3.StorageController"
+    "release": "2024.3",
+    "title": "#StorageController.v1_8_0.StorageController"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/UpdateService.v1_14_0.json b/redfish-core/schema/dmtf/json-schema/UpdateService.v1_14_1.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/UpdateService.v1_14_0.json
rename to redfish-core/schema/dmtf/json-schema/UpdateService.v1_14_1.json
index 98e64f4..69aa80a 100644
--- a/redfish-core/schema/dmtf/json-schema/UpdateService.v1_14_0.json
+++ b/redfish-core/schema/dmtf/json-schema/UpdateService.v1_14_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/UpdateService.v1_14_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/UpdateService.v1_14_1.json",
     "$ref": "#/definitions/UpdateService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -709,5 +709,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2024.1",
-    "title": "#UpdateService.v1_14_0.UpdateService"
+    "title": "#UpdateService.v1_14_1.UpdateService"
 }
\ No newline at end of file
diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index d4e8785..d0e3060 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -9,7 +9,7 @@
 import requests
 from generate_schema_collections import generate_top_collections
 
-VERSION = "DSP8010_2024.2"
+VERSION = "DSP8010_2024.3"
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))