Update to 2024.4

Update schema to the latest release 2024.4.

See below for more info on this release:
https://www.dmtf.org/standards/redfish

Tested:
- Redfish Service Validator passes

Change-Id: I1845d6afa04ee418ba3ab0bd0bc8ce59886e4376
Signed-off-by: Myung Bae <myungbae@us.ibm.com>
diff --git a/redfish-core/include/generated/enums/control.hpp b/redfish-core/include/generated/enums/control.hpp
index d9fb383..5e6f6cd 100644
--- a/redfish-core/include/generated/enums/control.hpp
+++ b/redfish-core/include/generated/enums/control.hpp
@@ -18,6 +18,7 @@
     Valve,
     Percent,
     DutyCycle,
+    LiquidFlowLPM,
 };
 
 enum class SetPointType{
@@ -52,6 +53,7 @@
     {ControlType::Valve, "Valve"},
     {ControlType::Percent, "Percent"},
     {ControlType::DutyCycle, "DutyCycle"},
+    {ControlType::LiquidFlowLPM, "LiquidFlowLPM"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(SetPointType, {
diff --git a/redfish-core/include/generated/enums/cooling_unit.hpp b/redfish-core/include/generated/enums/cooling_unit.hpp
index 873597d..92d8c1e 100644
--- a/redfish-core/include/generated/enums/cooling_unit.hpp
+++ b/redfish-core/include/generated/enums/cooling_unit.hpp
@@ -14,6 +14,12 @@
     ImmersionUnit,
 };
 
+enum class CoolingUnitMode{
+    Invalid,
+    Enabled,
+    Disabled,
+};
+
 NLOHMANN_JSON_SERIALIZE_ENUM(CoolingEquipmentType, {
     {CoolingEquipmentType::Invalid, "Invalid"},
     {CoolingEquipmentType::CDU, "CDU"},
@@ -21,5 +27,11 @@
     {CoolingEquipmentType::ImmersionUnit, "ImmersionUnit"},
 });
 
+NLOHMANN_JSON_SERIALIZE_ENUM(CoolingUnitMode, {
+    {CoolingUnitMode::Invalid, "Invalid"},
+    {CoolingUnitMode::Enabled, "Enabled"},
+    {CoolingUnitMode::Disabled, "Disabled"},
+});
+
 }
 // clang-format on
diff --git a/redfish-core/include/generated/enums/manager.hpp b/redfish-core/include/generated/enums/manager.hpp
index 1b06b87..67da7e5 100644
--- a/redfish-core/include/generated/enums/manager.hpp
+++ b/redfish-core/include/generated/enums/manager.hpp
@@ -46,6 +46,15 @@
     PreserveNetwork,
 };
 
+enum class DateTimeSource{
+    Invalid,
+    RTC,
+    Firmware,
+    Host,
+    NTP,
+    PTP,
+};
+
 NLOHMANN_JSON_SERIALIZE_ENUM(ManagerType, {
     {ManagerType::Invalid, "Invalid"},
     {ManagerType::ManagementController, "ManagementController"},
@@ -85,5 +94,14 @@
     {ResetToDefaultsType::PreserveNetwork, "PreserveNetwork"},
 });
 
+NLOHMANN_JSON_SERIALIZE_ENUM(DateTimeSource, {
+    {DateTimeSource::Invalid, "Invalid"},
+    {DateTimeSource::RTC, "RTC"},
+    {DateTimeSource::Firmware, "Firmware"},
+    {DateTimeSource::Host, "Host"},
+    {DateTimeSource::NTP, "NTP"},
+    {DateTimeSource::PTP, "PTP"},
+});
+
 }
 // clang-format on
diff --git a/redfish-core/include/generated/enums/pcie_device.hpp b/redfish-core/include/generated/enums/pcie_device.hpp
index 88e865a..d1c9cb0 100644
--- a/redfish-core/include/generated/enums/pcie_device.hpp
+++ b/redfish-core/include/generated/enums/pcie_device.hpp
@@ -36,6 +36,7 @@
     OCP3Small,
     OCP3Large,
     U2,
+    EDSFF,
 };
 
 enum class LaneSplittingType{
@@ -89,6 +90,7 @@
     {SlotType::OCP3Small, "OCP3Small"},
     {SlotType::OCP3Large, "OCP3Large"},
     {SlotType::U2, "U2"},
+    {SlotType::EDSFF, "EDSFF"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(LaneSplittingType, {
diff --git a/redfish-core/include/generated/enums/port.hpp b/redfish-core/include/generated/enums/port.hpp
index df08ee4..17ce40b 100644
--- a/redfish-core/include/generated/enums/port.hpp
+++ b/redfish-core/include/generated/enums/port.hpp
@@ -168,6 +168,13 @@
     Type3MLD,
 };
 
+enum class HostDeviceType{
+    Invalid,
+    None,
+    System,
+    Manager,
+};
+
 NLOHMANN_JSON_SERIALIZE_ENUM(PortType, {
     {PortType::Invalid, "Invalid"},
     {PortType::UpstreamPort, "UpstreamPort"},
@@ -329,5 +336,12 @@
     {ConnectedDeviceType::Type3MLD, "Type3MLD"},
 });
 
+NLOHMANN_JSON_SERIALIZE_ENUM(HostDeviceType, {
+    {HostDeviceType::Invalid, "Invalid"},
+    {HostDeviceType::None, "None"},
+    {HostDeviceType::System, "System"},
+    {HostDeviceType::Manager, "Manager"},
+});
+
 }
 // clang-format on
diff --git a/redfish-core/include/generated/enums/pump.hpp b/redfish-core/include/generated/enums/pump.hpp
index a83a3b9..a18b9e4 100644
--- a/redfish-core/include/generated/enums/pump.hpp
+++ b/redfish-core/include/generated/enums/pump.hpp
@@ -13,11 +13,23 @@
     Compressor,
 };
 
+enum class PumpMode{
+    Invalid,
+    Enabled,
+    Disabled,
+};
+
 NLOHMANN_JSON_SERIALIZE_ENUM(PumpType, {
     {PumpType::Invalid, "Invalid"},
     {PumpType::Liquid, "Liquid"},
     {PumpType::Compressor, "Compressor"},
 });
 
+NLOHMANN_JSON_SERIALIZE_ENUM(PumpMode, {
+    {PumpMode::Invalid, "Invalid"},
+    {PumpMode::Enabled, "Enabled"},
+    {PumpMode::Disabled, "Disabled"},
+});
+
 }
 // clang-format on
diff --git a/redfish-core/include/generated/enums/resource.hpp b/redfish-core/include/generated/enums/resource.hpp
index a4171ce..45c1afa 100644
--- a/redfish-core/include/generated/enums/resource.hpp
+++ b/redfish-core/include/generated/enums/resource.hpp
@@ -45,6 +45,7 @@
     Suspend,
     Pause,
     Resume,
+    FullPowerCycle,
 };
 
 enum class IndicatorLED{
@@ -152,6 +153,7 @@
     {ResetType::Suspend, "Suspend"},
     {ResetType::Pause, "Pause"},
     {ResetType::Resume, "Resume"},
+    {ResetType::FullPowerCycle, "FullPowerCycle"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(IndicatorLED, {
diff --git a/redfish-core/schema/dmtf/csdl/AccountService_v1.xml b/redfish-core/schema/dmtf/csdl/AccountService_v1.xml
index ab0450c..1b66781 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.16.0                                              -->
+<!--# Redfish Schema:  AccountService 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                                   -->
@@ -1635,7 +1635,7 @@
         <NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The link to a collection of CA certificates used to validate client certificates."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `CertificateCollection` that represents the CA certificates used to validate client certificates during TLS handshaking.  Regardless of the contents of this collection, services may perform additional verification based on other factors, such as the configuration of the `SecurityPolicy` resource.  If the service supports the `RevokedCertificates` or `TrustedCertificates` properties within the `Client` property within TLS property of the `SecurityPolicy` resource, the service shall verify the provided client certificate with the `SecurityPolicy` resource prior to verifying it with this collection."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `CertificateCollection` that represents the CA certificates used to validate client certificates during TLS handshaking.  Regardless of the contents of this collection, services may perform additional verification based on other factors, such as the configuration of the `SecurityPolicy` resource.  If the service supports the `RevokedCertificates` or `TrustedCertificates` properties within the `Server` property within the `TLS` property of the `SecurityPolicy` resource, the service shall verify the provided client certificate with the `SecurityPolicy` resource prior to verifying it with this collection."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
       </ComplexType>
@@ -1701,6 +1701,12 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_12_4.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_12_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the reference made to `SecurityPolicy` in the `ClientCertificate` multi-factor authentication object."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_12_5.AccountService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_13_0">
       <Annotation Term="Redfish.Release" String="2023.1"/>
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1764,6 +1770,12 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_13_3.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_13_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the reference made to `SecurityPolicy` in the `ClientCertificate` multi-factor authentication object."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_13_4.AccountService"/>
+    </Schema>
+
     <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"/>
@@ -1820,6 +1832,12 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_14_1.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_14_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the reference made to `SecurityPolicy` in the `ClientCertificate` multi-factor authentication object."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_14_2.AccountService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_15_0">
       <Annotation Term="Redfish.Release" String="2023.3"/>
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1854,6 +1872,12 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_15_0.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_15_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the reference made to `SecurityPolicy` in the `ClientCertificate` multi-factor authentication object."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_15_1.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"/>
@@ -1899,5 +1923,25 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_16_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the reference made to `SecurityPolicy` in the `ClientCertificate` multi-factor authentication object."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_16_0.AccountService"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_17_0">
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="AccountService" BaseType="AccountService.v1_16_1.AccountService">
+        <Property Name="EnforcePasswordHistoryCount" Type="Edm.Int64" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The number of unique new passwords that need to be associated with a user account before a previous password is accepted when modifying the password.  If `0`, a user does not need to provide a unique new password."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of unique new passwords that need to be associated with a user account before a previous password is accepted when modifying the password.  If not `0`, services shall reject modification requests of the `Password` property and `ChangePassword` actions that contain a previously used password in the specified count.  If `0`, services shall not require the user to provide a unique new password.  This property does not apply to accounts from external account providers."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Cable_v1.xml b/redfish-core/schema/dmtf/csdl/Cable_v1.xml
index 50ab580..b3b2ab7 100644
--- a/redfish-core/schema/dmtf/csdl/Cable_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Cable_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Cable v1.2.3                                                        -->
+<!--# Redfish Schema:  Cable v1.2.4                                                        -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -357,13 +357,13 @@
           <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Port` that represent the physical upstream connections connected to this cable."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
-        <NavigationProperty Name="DownstreamResources" Type="Collection(Resource.Resource)">
+        <NavigationProperty Name="DownstreamResources" Type="Collection(Resource.Item)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="An array of links to the downstream resources connected to this cable."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources that represent the physical downstream connections connected to this cable.  Even if the resource is already referenced in another property within `Links`, such as `DownstreamPorts` or `DownstreamChassis`, it shall also be referenced in this property."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
-        <NavigationProperty Name="UpstreamResources" Type="Collection(Resource.Resource)">
+        <NavigationProperty Name="UpstreamResources" Type="Collection(Resource.Item)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="An array of links to the upstream resources connected to this cable."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources that represent the physical upstream connections connected to this cable.  Even if the resource is already referenced in another property within `Links`, such as `UpstreamPorts` or `UpstreamChassis`, it shall also be referenced in this property."/>
@@ -390,6 +390,12 @@
       <EntityType Name="Cable" BaseType="Cable.v1_0_2.Cable"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Cable.v1_0_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the `DownstreamResources` and `UpstreamResources` properties to allow them to link to referenceable members."/>
+      <EntityType Name="Cable" BaseType="Cable.v1_0_3.Cable"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Cable.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.3"/>
@@ -421,6 +427,12 @@
       <EntityType Name="Cable" BaseType="Cable.v1_1_2.Cable"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Cable.v1_1_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the `DownstreamResources` and `UpstreamResources` properties to allow them to link to referenceable members."/>
+      <EntityType Name="Cable" BaseType="Cable.v1_1_3.Cable"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Cable.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -447,5 +459,11 @@
       <EntityType Name="Cable" BaseType="Cable.v1_2_2.Cable"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Cable.v1_2_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the `DownstreamResources` and `UpstreamResources` properties to allow them to link to referenceable members."/>
+      <EntityType Name="Cable" BaseType="Cable.v1_2_3.Cable"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/CertificateService_v1.xml b/redfish-core/schema/dmtf/csdl/CertificateService_v1.xml
index ee21dcf..fd0879a 100644
--- a/redfish-core/schema/dmtf/csdl/CertificateService_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/CertificateService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  CertificateService v1.0.5                                           -->
+<!--# Redfish Schema:  CertificateService v1.0.6                                           -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -76,23 +76,23 @@
           <Annotation Term="OData.Description" String="The additional host names of the component to secure."/>
           <Annotation Term="OData.LongDescription" String="This parameter shall contain an array of additional host names of the component to secure, as defined by the RFC5280 'subjectAltName' attribute."/>
         </Parameter>
-        <Parameter Name="Organization" Type="Edm.String" Nullable="false">
+        <Parameter Name="Organization" Type="Edm.String">
           <Annotation Term="OData.Description" String="The name of the organization making the request."/>
           <Annotation Term="OData.LongDescription" String="This parameter shall contain the name of the organization making the request, as defined by the RFC5280 'organizationName' attribute."/>
         </Parameter>
-        <Parameter Name="OrganizationalUnit" Type="Edm.String" Nullable="false">
+        <Parameter Name="OrganizationalUnit" Type="Edm.String">
           <Annotation Term="OData.Description" String="The name of the unit or division of the organization making the request."/>
           <Annotation Term="OData.LongDescription" String="This parameter shall contain the name of the unit or division of the organization making the request, as defined by the RFC5280 'organizationalUnitName' attribute."/>
         </Parameter>
-        <Parameter Name="City" Type="Edm.String" Nullable="false">
+        <Parameter Name="City" Type="Edm.String">
           <Annotation Term="OData.Description" String="The city or locality of the organization making the request."/>
           <Annotation Term="OData.LongDescription" String="This parameter shall contain the city or locality of the organization making the request, as defined by the RFC5280 'localityName' attribute."/>
         </Parameter>
-        <Parameter Name="State" Type="Edm.String" Nullable="false">
+        <Parameter Name="State" Type="Edm.String">
           <Annotation Term="OData.Description" String="The state, province, or region of the organization making the request."/>
           <Annotation Term="OData.LongDescription" String="This parameter shall contain the state, province, or region of the organization making the request, as defined by the RFC5280 'stateOrProvinceName' attribute."/>
         </Parameter>
-        <Parameter Name="Country" Type="Edm.String" Nullable="false">
+        <Parameter Name="Country" Type="Edm.String">
           <Annotation Term="OData.Description" String="The two-letter country code of the organization making the request."/>
           <Annotation Term="OData.LongDescription" String="This parameter shall contain the two-letter ISO code for the country of the organization making the request, as defined by the RFC5280 'countryName' attribute."/>
         </Parameter>
@@ -248,5 +248,11 @@
       <EntityType Name="CertificateService" BaseType="CertificateService.v1_0_4.CertificateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CertificateService.v1_0_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to change several parameters in the `GenerateCSR` action to be optional instead of required."/>
+      <EntityType Name="CertificateService" BaseType="CertificateService.v1_0_5.CertificateService"/>
+    </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 a8a64ef..6fb0838 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.2                                                     -->
+<!--# Redfish Schema:  Chassis v1.26.0                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -139,6 +139,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CoolingLoop_v1.xml">
     <edmx:Include Namespace="CoolingLoop"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/LeakDetectorCollection_v1.xml">
+    <edmx:Include Namespace="LeakDetectorCollection"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -2652,5 +2655,19 @@
       <EntityType Name="Chassis" BaseType="Chassis.v1_25_1.Chassis"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_26_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="Chassis" BaseType="Chassis.v1_25_2.Chassis">
+        <NavigationProperty Name="LeakDetectors" Type="LeakDetectorCollection.LeakDetectorCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the collection of leak detectors located in this chassis."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `LeakDetectorCollection`."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+    </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 ec9bd25..3042f92 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.23.0                                              -->
+<!--# Redfish Schema:  ComputerSystem v1.23.1                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -2646,8 +2646,8 @@
         </Property>
         <Property Name="PowerOnDelaySeconds" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="The number of seconds to delay power on after a power cycle or during a reset.  Zero seconds indicates no delay to power up."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the number of seconds to delay power on after a power cycle or during a reset.  The value `0` shall indicate no delay to power on."/>
+          <Annotation Term="OData.Description" String="The number of seconds to delay power on after an externally performed power cycle or during a reset.  Zero seconds indicates no delay to power up."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of seconds to delay power on after an externally performed power cycle or during a reset.  The value `0` shall indicate no delay to power on."/>
         </Property>
         <Property Name="PowerOffDelaySeconds" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -2656,8 +2656,8 @@
         </Property>
         <Property Name="PowerCycleDelaySeconds" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="The number of seconds to delay power on after a `Reset` action requesting `PowerCycle`.  Zero seconds indicates no delay."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the number of seconds to delay power on after a `Reset` action requesting `PowerCycle`.  The value `0` shall indicate no delay to power on."/>
+          <Annotation Term="OData.Description" String="The number of seconds to delay power on after a `Reset` action requesting `PowerCycle` or `FullPowerCycle`.  Zero seconds indicates no delay."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of seconds to delay power on after a `Reset` action requesting `PowerCycle` or `FullPowerCycle`.  The value `0` shall indicate no delay to power on."/>
         </Property>
         <Property Name="SerialConsole" Type="ComputerSystem.v1_13_0.HostSerialConsole" Nullable="false">
           <Annotation Term="OData.Description" String="The serial console services that this system provides."/>
@@ -2930,6 +2930,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_13_9.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_13_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description of `PowerCycleDelaySeconds` to include the usage with `FullPowerCycle`."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_13_10.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"/>
@@ -3039,6 +3045,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_14_8.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_14_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description of `PowerCycleDelaySeconds` to include the usage with `FullPowerCycle`."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_14_9.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"/>
@@ -3191,6 +3203,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_15_7.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_15_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description of `PowerCycleDelaySeconds` to include the usage with `FullPowerCycle`."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_15_8.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"/>
@@ -3343,6 +3361,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_16_8.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_16_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description of `PowerCycleDelaySeconds` to include the usage with `FullPowerCycle`."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_16_9.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"/>
@@ -3408,6 +3432,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_17_7.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_17_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description of `PowerCycleDelaySeconds` to include the usage with `FullPowerCycle`."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_17_8.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"/>
@@ -3496,6 +3526,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_18_6.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_18_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description of `PowerCycleDelaySeconds` to include the usage with `FullPowerCycle`."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_18_7.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"/>
@@ -3555,6 +3591,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_19_6.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_19_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description of `PowerCycleDelaySeconds` to include the usage with `FullPowerCycle`."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_19_7.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"/>
@@ -3620,6 +3662,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_20_5.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_20_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description of `PowerCycleDelaySeconds` to include the usage with `FullPowerCycle`."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_20_6.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"/>
@@ -3705,6 +3753,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_21_3.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_21_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description of `PowerCycleDelaySeconds` to include the usage with `FullPowerCycle`."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_21_4.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"/>
@@ -3731,6 +3785,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_22_2.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_22_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description of `PowerCycleDelaySeconds` to include the usage with `FullPowerCycle`."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_22_3.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"/>
@@ -3787,5 +3847,11 @@
       </EnumType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_23_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description of `PowerCycleDelaySeconds` to include the usage with `FullPowerCycle`."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_23_0.ComputerSystem"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Connection_v1.xml b/redfish-core/schema/dmtf/csdl/Connection_v1.xml
index aa42a6f..d4ed5fd 100644
--- a/redfish-core/schema/dmtf/csdl/Connection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Connection_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Connection v1.3.2                                                   -->
+<!--# Redfish Schema:  Connection v1.4.0                                                   -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -74,6 +74,54 @@
           </Collection>
         </Annotation>
       </EntityType>
+
+      <Action Name="AddVolumeInfo" IsBound="true">
+        <Annotation Term="OData.Description" String="This action adds a volume to the connection.  Volumes are added to the `VolumeInfo` property."/>
+        <Annotation Term="OData.LongDescription" String="This action shall add a volume to the connection.  Services shall add the volume to the `VolumeInfo` property."/>
+        <Parameter Name="Connection" Type="Connection.v1_0_0.Actions"/>
+        <Parameter Name="Volume" Type="Volume.Volume" Nullable="false">
+          <Annotation Term="OData.Description" String="The volume to add."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain a link to a resource of type `Volume` that represents the volume to add."/>
+        </Parameter>
+        <Parameter Name="LUN" Type="Edm.Int64">
+          <Annotation Term="OData.Description" String="The initiator-visible logical unit number (LUN) to assign to the volume.  Clients are required to provide either `LUN`, `AccessCapabilities`, or both."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the initiator-visible logical unit number (LUN) to assign to the volume.  Services shall reject requests that do not contain either `LUN` or `AccessCapabilities`."/>
+        </Parameter>
+        <Parameter Name="AccessCapabilities" Type="Collection(Connection.v1_0_0.AccessCapability)">
+          <Annotation Term="OData.Description" String="The supported I/O access capabilities to assign to the volume.  Clients are required to provide either `LUN`, `AccessCapabilities`, or both."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain an array of the storage access capabilities to assign to the volume.  Services shall reject requests that do not contain either `LUN` or `AccessCapabilities`."/>
+        </Parameter>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_4_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+
+      <Action Name="RemoveVolumeInfo" IsBound="true">
+        <Annotation Term="OData.Description" String="This action removes a volume from the connection.  Volumes are removed from the `VolumeInfo` property."/>
+        <Annotation Term="OData.LongDescription" String="This action shall remove a volume to the connection.  Services shall remove the volume from the `VolumeInfo` property."/>
+        <Parameter Name="Connection" Type="Connection.v1_0_0.Actions"/>
+        <Parameter Name="Volume" Type="Volume.Volume" Nullable="false">
+          <Annotation Term="OData.Description" String="The volume to remove."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain a link to a resource of type `Volume` that represents the volume to remove."/>
+        </Parameter>
+        <Parameter Name="LUN" Type="Edm.Int64">
+          <Annotation Term="OData.Description" String="The initiator-visible logical unit number (LUN) assigned to the volume to remove."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the initiator-visible logical unit number (LUN) assigned to this volume to remove.  If this parameter is not provided, the service shall remove all entries associated with volume referenced by the `Volume` parameter."/>
+        </Parameter>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_4_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Connection.v1_0_0">
@@ -427,7 +475,7 @@
         <NavigationProperty Name="MemoryRegion" Type="MemoryRegion.MemoryRegion">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The specified memory region."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `MemoryRegion`.  The endpoints referenced by the `InitiatorEndpoints` or `InitiatorEndpointGroups` properties shall be given access to this memory region as described by this object.  If `TargetEndpoints` or `TargetEndpointGroups` is present, the referenced initiator endpoints shall be required to access the referenced memory region through one of the referenced target endpoints."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `MemoryRegion`.  The endpoints referenced by the `InitiatorEndpoints` or `InitiatorEndpointGroups` properties shall be given access to this memory region as described by this object.  If `TargetEndpoints` or `TargetEndpointGroups` is present, the referenced initiator endpoints shall be required to access the referenced memory region through one of the referenced target endpoints.  For CXL fabrics, memory regions from `Connection` resources are not allowed."/>
         </NavigationProperty>
       </ComplexType>
     </Schema>
@@ -444,5 +492,19 @@
       <EntityType Name="Connection" BaseType="Connection.v1_3_1.Connection"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Connection.v1_3_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the description of the `MemoryRegions` property for CXL fabrics."/>
+      <EntityType Name="Connection" BaseType="Connection.v1_3_2.Connection"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Connection.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add the `AddVolumeInfo` and `RemoveVolumeInfo` actions."/>
+
+      <EntityType Name="Connection" BaseType="Connection.v1_3_3.Connection"/>
+    </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 0d98d48..0cea769 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.2                                                      -->
+<!--# Redfish Schema:  Control v1.6.0                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -235,7 +235,7 @@
         <NavigationProperty Name="Sensor" Type="Sensor.Sensor">
           <Annotation Term="Redfish.ExcerptCopy"/>
           <Annotation Term="OData.Description" String="The sensor reading associated with this control."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the Sensor excerpt directly associated with this control.  The value of the `DataSourceUri` property shall reference a resource of type `Sensor`.  This property shall not be present if multiple sensors are associated with a single control."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the `Sensor` excerpt directly associated with this control.  The value of the `DataSourceUri` property shall reference a resource of type `Sensor`.  This property shall not be present if multiple sensors are associated with a single control."/>
         </NavigationProperty>
         <NavigationProperty Name="AssociatedSensors" Type="Collection(Sensor.Sensor)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -321,7 +321,7 @@
               <Record>
                 <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
                 <PropertyValue Property="Version" String="v1_3_0"/>
-                <PropertyValue Property="Description" String="This value has been deprecated in favor of `PressurekPa` for units consistency with the equivalent Sensor resource ReadingType value."/>
+                <PropertyValue Property="Description" String="This value has been deprecated in favor of `PressurekPa` for units consistency with the equivalent `Sensor` resource `ReadingType` value."/>
               </Record>
             </Collection>
           </Annotation>
@@ -374,6 +374,18 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="LiquidFlowLPM">
+          <Annotation Term="OData.Description" String="Liquid flow (L/min) control."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a control used to adjust the volume of liquid per unit of time, in liters per minute units, that flows through a particular junction.  The `SetPointUnits` property shall contain `L/min`."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_6_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <EnumType Name="SetPointType">
@@ -592,5 +604,13 @@
       <EntityType Name="Control" BaseType="Control.v1_5_1.Control"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Control.v1_6_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add `LiquidFlowLPM` to `ControlType`."/>
+
+      <EntityType Name="Control" BaseType="Control.v1_5_2.Control"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/CoolantConnector_v1.xml b/redfish-core/schema/dmtf/csdl/CoolantConnector_v1.xml
index 4698ebf..15b8c8a 100644
--- a/redfish-core/schema/dmtf/csdl/CoolantConnector_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/CoolantConnector_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  CoolantConnector v1.0.2                                             -->
+<!--# Redfish Schema:  CoolantConnector 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                                   -->
@@ -268,5 +268,43 @@
       <EntityType Name="CoolantConnector" BaseType="CoolantConnector.v1_0_1.CoolantConnector"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CoolantConnector.v1_1_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="CoolantConnector" BaseType="CoolantConnector.v1_0_2.CoolantConnector">
+        <NavigationProperty Name="FlowControlLitersPerMinute" Type="Control.Control">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="SingleLoop"/>
+          <Annotation Term="OData.Description" String="The desired liquid flow rate (L/min)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the desired liquid flow rate, in liters per minute units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `LiquidFlowLPM`.  This property shall only be present for secondary coolant connectors.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts."/>
+        </NavigationProperty>
+        <NavigationProperty Name="SupplyTemperatureControlCelsius" Type="Control.Control">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="SingleLoop"/>
+          <Annotation Term="OData.Description" String="The desired supply temperature (C)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the desired supply temperature, in degree Celsius units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `Temperature`.  This property shall only be present for secondary coolant connectors.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts."/>
+        </NavigationProperty>
+        <NavigationProperty Name="ReturnTemperatureControlCelsius" Type="Control.Control">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="SingleLoop"/>
+          <Annotation Term="OData.Description" String="The desired return temperature (C)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the desired return temperature, in degree Celsius units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `Temperature`.  This property shall only be present for secondary coolant connectors.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts."/>
+        </NavigationProperty>
+        <NavigationProperty Name="DeltaPressureControlkPa" Type="Control.Control">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="SingleLoop"/>
+          <Annotation Term="OData.Description" String="The desired differential pressure (kPa)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the desired differential pressure, in kilopascal units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `PressurekPa`.  This property shall only be present for secondary coolant connectors.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts."/>
+        </NavigationProperty>
+        <NavigationProperty Name="DeltaTemperatureControlCelsius" Type="Control.Control">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="SingleLoop"/>
+          <Annotation Term="OData.Description" String="The desired differential temperature (C)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the desired differential temperature, in degree Celsius units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `Temperature`.  This property shall only be present for secondary coolant connectors.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts."/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/CoolingUnit_v1.xml b/redfish-core/schema/dmtf/csdl/CoolingUnit_v1.xml
index b810f69..9d976b2 100644
--- a/redfish-core/schema/dmtf/csdl/CoolingUnit_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/CoolingUnit_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  CoolingUnit v1.1.2                                                  -->
+<!--# Redfish Schema:  CoolingUnit 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                                   -->
@@ -99,6 +99,24 @@
           </Collection>
         </Annotation>
       </EntityType>
+
+      <Action Name="SetMode" IsBound="true">
+        <Annotation Term="OData.Description" String="This action sets the operating mode of the cooling unit."/>
+        <Annotation Term="OData.LongDescription" String="This action shall set the operating mode of the cooling unit."/>
+        <Parameter Name="CoolingUnit" Type="CoolingUnit.v1_0_0.Actions"/>
+        <Parameter Name="Mode" Type="CoolingUnit.v1_2_0.CoolingUnitMode">
+          <Annotation Term="OData.Description" String="The desired operating mode of the cooling unit."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the desired operating mode of the cooling unit."/>
+        </Parameter>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_2_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CoolingUnit.v1_0_0">
@@ -197,7 +215,7 @@
         <NavigationProperty Name="LeakDetection" Type="LeakDetection.LeakDetection" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="A link to the leak detection components associated with this equipment."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `LeakDetection` that contains the leak detection component information for this equipment."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `LeakDetection` that contains the leak detection component information for this equipment.  This link should be used when the leak detection capabilities are tied to a particular cooling unit or system which may span multiple `Chassis` resources.  For equipment represented with a single `Chassis` resource or detection inside a particular `Chassis` resource, populating the `LeakDetection` resource under `ThermalSubsystem` for the relevant `Chassis` is the preferred approach."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
         <NavigationProperty Name="Pumps" Type="PumpCollection.PumpCollection" Nullable="false">
@@ -304,6 +322,12 @@
       <EntityType Name="CoolingUnit" BaseType="CoolingUnit.v1_0_1.CoolingUnit"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CoolingUnit.v1_0_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of  `LeakDetection`."/>
+      <EntityType Name="CoolingUnit" BaseType="CoolingUnit.v1_0_2.CoolingUnit"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CoolingUnit.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -328,5 +352,30 @@
       <EntityType Name="CoolingUnit" BaseType="CoolingUnit.v1_1_1.CoolingUnit"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CoolingUnit.v1_1_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of  `LeakDetection`."/>
+      <EntityType Name="CoolingUnit" BaseType="CoolingUnit.v1_1_2.CoolingUnit"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CoolingUnit.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add the `SetMode` action."/>
+
+      <EntityType Name="CoolingUnit" BaseType="CoolingUnit.v1_1_3.CoolingUnit"/>
+
+      <EnumType Name="CoolingUnitMode">
+        <Member Name="Enabled">
+          <Annotation Term="OData.Description" String="Enable the cooling unit."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a request to enable the cooling unit.  Upon successful completion, the `State` property within `Status`, shall contain the value `Enabled`."/>
+        </Member>
+        <Member Name="Disabled">
+          <Annotation Term="OData.Description" String="Disable the cooling unit."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a request to disable the cooling unit.  When disabled, primary functions of the cooling unit, such as pump activity, are also disabled.  When disabled, the cooling unit may perform administrative functions, such as monitoring sensors, controlling valves, and accepting new firmware.  Upon successful completion, the `State` property within `Status`, shall contain the value `Disabled`."/>
+        </Member>
+      </EnumType>
+    </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 c577056..b92974f 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.1                                                               -->
+<!--# Redfish Schema:  Drive v1.21.0                                                               -->
 <!--#                                                                                              -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,              -->
 <!--# available at http://www.dmtf.org/standards/redfish                                           -->
@@ -208,8 +208,8 @@
         </Property>
         <Property Name="Revision" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The revision of this drive.  For SCSI-based drives, this is the version of the drive from the 'Inquiry' command, which can be the firmware or hardware version.  For other types of drives, this is the hardware version."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the manufacturer-defined revision for the associated drive.  For SCSI-based drives, this is the version of the drive from the 'Inquiry' command, which can be the firmware or hardware version.  For other types of drives, this is the hardware version."/>
+          <Annotation Term="OData.Description" String="The revision of a SCSI-based drive, as returned from the 'Inquiry' command, which can be the firmware or hardware version.  For other types of drives, the `HardwareVersion` and `FirmwareVersion` properties are recommended in favor of this property."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the manufacturer-defined revision for a SCSI-based drive, as returned in the 'Product Revision Level' field from the 'Inquiry' command, which can be the firmware or hardware version.  For other types of drives, this property should not be present and services should support the `HardwareVersion` and `FirmwareVersion` properties in favor of this property.  If this property is present for drives that are not SCSI-based, the value may contain a firmware version, hardware version, or a combination."/>
         </Property>
         <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."/>
@@ -2221,5 +2221,18 @@
       <EntityType Name="Drive" BaseType="Drive.v1_20_0.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_21_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="Drive" BaseType="Drive.v1_20_1.Drive">
+        <Property Name="HardwareVersion" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The hardware version of this drive."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the hardware version of this drive as determined by the vendor or supplier."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/EthernetInterface_v1.xml b/redfish-core/schema/dmtf/csdl/EthernetInterface_v1.xml
index 706416e..3163cff 100644
--- a/redfish-core/schema/dmtf/csdl/EthernetInterface_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/EthernetInterface_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  EthernetInterface v1.12.2                                           -->
+<!--# Redfish Schema:  EthernetInterface v1.12.3                                           -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -112,7 +112,7 @@
         <Property Name="InterfaceEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="An indication of whether this interface is enabled."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether this interface is enabled."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether this interface is enabled.  If this interface is also a host interface, modifying this property may modify the `InterfaceEnabled` property in the `HostInterface` resource for this interface."/>
         </Property>
         <Property Name="PermanentMACAddress" Type="EthernetInterface.v1_0_0.MACAddress">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -335,6 +335,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_0_16.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_0_18">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_0_17.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -466,6 +472,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_1_14.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_1_16">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_1_15.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.3"/>
@@ -566,6 +578,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_2_13.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_2_15">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_2_14.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -681,6 +699,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_3_12.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_3_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_3_13.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -914,6 +938,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_4_11.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_4_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_4_12.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -1004,6 +1034,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_5_9.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_5_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_5_10.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -1094,6 +1130,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_6_7.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_6_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_6_8.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1135,6 +1177,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_7_3.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_7_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_7_4.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1167,6 +1215,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_8_3.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_8_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_8_4.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -1247,6 +1301,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_9_3.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_9_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_9_4.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -1281,6 +1341,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_10_2.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_10_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_10_3.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -1331,6 +1397,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_11_2.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_11_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_11_3.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -1356,5 +1428,11 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_12_1.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_12_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_12_2.EthernetInterface"/>
+    </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 f31bdb0..85d41e3 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.15.0                                            -->
+<!--# Redfish Schema:  EventDestination v1.15.1                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -856,7 +856,7 @@
       <EnumType Name="DeliveryRetryPolicy">
         <Member Name="TerminateAfterRetries">
           <Annotation Term="OData.Description" String="The subscription is terminated after the maximum number of retries is reached."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate the subscription is terminated after the maximum number of retries is reached, specified by the `DeliveryRetryAttempts` property in the event service."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the subscription is terminated after the maximum number of retries is reached, specified by the `DeliveryRetryAttempts` property in the event service.  The service shall delete this resource to terminate the subscription."/>
         </Member>
         <Member Name="SuspendRetries">
           <Annotation Term="OData.Description" String="The subscription is suspended after the maximum number of retries is reached."/>
@@ -935,6 +935,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_6_8.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_6_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that terminating a subscription also deletes the resource."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_6_9.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -1147,6 +1153,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_7_9.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_7_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that terminating a subscription also deletes the resource."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_7_10.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"/>
@@ -1220,6 +1232,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_8_9.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_8_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that terminating a subscription also deletes the resource."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_8_10.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"/>
@@ -1444,6 +1462,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_9_10.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_9_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that terminating a subscription also deletes the resource."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_9_11.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."/>
@@ -1525,6 +1549,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_10_9.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_10_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that terminating a subscription also deletes the resource."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_10_10.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"/>
@@ -1599,6 +1629,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_11_7.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_11_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that terminating a subscription also deletes the resource."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_11_8.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"/>
@@ -1654,6 +1690,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_12_5.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_12_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that terminating a subscription also deletes the resource."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_12_6.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"/>
@@ -1698,6 +1740,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_13_4.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_13_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that terminating a subscription also deletes the resource."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_13_5.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"/>
@@ -1718,6 +1766,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_14_1.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_14_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that terminating a subscription also deletes the resource."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_14_2.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"/>
@@ -1732,5 +1786,11 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_15_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that terminating a subscription also deletes the resource."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_15_0.EventDestination"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/EventService_v1.xml b/redfish-core/schema/dmtf/csdl/EventService_v1.xml
index f23d2a3..0a5d73b 100644
--- a/redfish-core/schema/dmtf/csdl/EventService_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/EventService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  EventService v1.10.2                                                -->
+<!--# Redfish Schema:  EventService v1.10.3                                                -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -170,8 +170,8 @@
         </Property>
         <Property Name="DeliveryRetryAttempts" Type="Edm.Int64" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="The number of times that the `POST` of an event is retried before the subscription terminates.  This retry occurs at the service level, which means that the HTTP `POST` to the event destination fails with an HTTP `4XX` or `5XX` status code or an HTTP timeout occurs this many times before the event destination subscription terminates."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the number of times that the `POST` of an event is retried before the subscription terminates.  This retry occurs at the service level, which means that the HTTP `POST` to the event destination fails with an HTTP `4XX` or `5XX` status code or an HTTP timeout occurs this many times before the event destination subscription terminates."/>
+          <Annotation Term="OData.Description" String="The number of times that the `POST` of an event is retried before the subscription terminates or is suspended.  This retry occurs at the service level, which means that the HTTP `POST` to the event destination fails with an HTTP `4XX` or `5XX` status code or an HTTP timeout occurs this many times before the event destination subscription terminates or is suspended."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of times that the `POST` of an event is retried before the subscription terminates or is suspended.  This retry occurs at the service level, which means that the HTTP `POST` to the event destination fails with an HTTP `4XX` or `5XX` status code or an HTTP timeout occurs this many times before the event destination subscription terminates or is suspended.  The service shall delete the `EventDestination` resource to terminate the subscription.  The service shall set the value of the `State` property within `Status` of the `EventDestination` resource to `Disabled` for a suspended subscription."/>
         </Property>
         <Property Name="DeliveryRetryIntervalSeconds" Type="Edm.Int64" Nullable="false">
           <Annotation Term="Measures.Unit" String="s"/>
@@ -322,6 +322,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_0_16.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_0_18">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description for `DeliveryRetryAttempts` to include subscription suspension."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_0_17.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -396,6 +402,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_1_9.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_1_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description for `DeliveryRetryAttempts` to include subscription suspension."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_1_10.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -538,6 +550,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_2_9.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_2_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description for `DeliveryRetryAttempts` to include subscription suspension."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_2_10.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -600,6 +618,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_3_8.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_3_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description for `DeliveryRetryAttempts` to include subscription suspension."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_3_9.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -663,6 +687,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_4_8.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_4_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description for `DeliveryRetryAttempts` to include subscription suspension."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_4_9.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -828,6 +858,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_5_8.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_5_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description for `DeliveryRetryAttempts` to include subscription suspension."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_5_9.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -889,6 +925,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_6_7.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_6_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description for `DeliveryRetryAttempts` to include subscription suspension."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_6_8.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -939,6 +981,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_7_6.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_7_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description for `DeliveryRetryAttempts` to include subscription suspension."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_7_7.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -981,6 +1029,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_8_3.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_8_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description for `DeliveryRetryAttempts` to include subscription suspension."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_8_4.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -1020,6 +1074,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_9_2.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_9_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description for `DeliveryRetryAttempts` to include subscription suspension."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_9_3.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -1040,5 +1100,11 @@
       <EntityType Name="EventService" BaseType="EventService.v1_10_1.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_10_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="Updated the description for `DeliveryRetryAttempts` to include subscription suspension."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_10_2.EventService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/HostInterface_v1.xml b/redfish-core/schema/dmtf/csdl/HostInterface_v1.xml
index a99ebe9..929fffc 100644
--- a/redfish-core/schema/dmtf/csdl/HostInterface_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/HostInterface_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  HostInterface v1.3.2                                                -->
+<!--# Redfish Schema:  HostInterface v1.3.3                                                -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -90,7 +90,7 @@
         <Property Name="InterfaceEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="An indication of whether this interface is enabled."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether this interface is enabled."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether this interface is enabled.  Modifying this property may modify the `InterfaceEnabled` property in the `EthernetInterface` resource for this host interface."/>
         </Property>
         <Property Name="ExternallyAccessible" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -289,6 +289,12 @@
       <EntityType Name="HostInterface" BaseType="HostInterface.v1_0_6.HostInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="HostInterface.v1_0_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="HostInterface" BaseType="HostInterface.v1_0_7.HostInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="HostInterface.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -359,6 +365,12 @@
       <EntityType Name="HostInterface" BaseType="HostInterface.v1_1_6.HostInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="HostInterface.v1_1_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="HostInterface" BaseType="HostInterface.v1_1_7.HostInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="HostInterface.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -405,6 +417,12 @@
       <EntityType Name="HostInterface" BaseType="HostInterface.v1_2_3.HostInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="HostInterface.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="HostInterface" BaseType="HostInterface.v1_2_4.HostInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="HostInterface.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -459,5 +477,11 @@
       <EntityType Name="HostInterface" BaseType="HostInterface.v1_3_1.HostInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="HostInterface.v1_3_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for `InterfaceEnabled` to show `EthernetInterface` and `HostInterface` may have ties."/>
+      <EntityType Name="HostInterface" BaseType="HostInterface.v1_3_2.HostInterface"/>
+    </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 97284a1..29d22d9 100644
--- a/redfish-core/schema/dmtf/csdl/LeakDetection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/LeakDetection_v1.xml
@@ -87,6 +87,15 @@
           <Annotation Term="OData.Description" String="The link to the collection of leak detectors within this subsystem."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type `LeakDetectorCollection`."/>
           <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_1_0"/>
+                <PropertyValue Property="Description" String="This property has been deprecated in favor of the `LeakDetectors` property in the related `Chassis` resource."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </NavigationProperty>
         <Property Name="Actions" Type="LeakDetection.v1_0_0.Actions" Nullable="false">
           <Annotation Term="OData.Description" String="The available actions for this resource."/>
@@ -140,6 +149,7 @@
     <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"/>
+      <Annotation Term="OData.Description" String="This version was created to deprecate the `LeakDetectors` property in favor of placing leak detectors under the related `Chassis` resource."/>
 
       <EntityType Name="LeakDetection" BaseType="LeakDetection.v1_0_1.LeakDetection"/>
 
diff --git a/redfish-core/schema/dmtf/csdl/LeakDetectorCollection_v1.xml b/redfish-core/schema/dmtf/csdl/LeakDetectorCollection_v1.xml
index bd85bef..fcdd74f 100644
--- a/redfish-core/schema/dmtf/csdl/LeakDetectorCollection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/LeakDetectorCollection_v1.xml
@@ -53,6 +53,15 @@
         </Annotation>
         <Annotation Term="Redfish.Uris">
           <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/LeakDetectors</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/LeakDetection/LeakDetectors</String>
+            <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/LeakDetection/LeakDetectors</String>
+            <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/LeakDetection/LeakDetectors</String>
+            <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/LeakDetection/LeakDetectors/</String>
+          </Collection>
+        </Annotation>
+        <Annotation Term="Redfish.DeprecatedUris">
+          <Collection>
             <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/LeakDetection/LeakDetectors</String>
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/LeakDetection/LeakDetectors</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/LeakDetection/LeakDetectors</String>
diff --git a/redfish-core/schema/dmtf/csdl/LeakDetector_v1.xml b/redfish-core/schema/dmtf/csdl/LeakDetector_v1.xml
index 2b25802..b8830f9 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.2.0                                                 -->
+<!--# Redfish Schema:  LeakDetector 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                                   -->
@@ -68,6 +68,15 @@
             <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/LeakDetection/LeakDetectors/{LeakDetectorId}</String>
             <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/LeakDetection/LeakDetectors/{LeakDetectorId}</String>
             <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/LeakDetection/LeakDetectors/{LeakDetectorId}</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/LeakDetectors/{LeakDetectorId}</String>
+          </Collection>
+        </Annotation>
+        <Annotation Term="Redfish.DeprecatedUris">
+          <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/LeakDetection/LeakDetectors/{LeakDetectorId}</String>
+            <String>/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/LeakDetection/LeakDetectors/{LeakDetectorId}</String>
+            <String>/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/LeakDetection/LeakDetectors/{LeakDetectorId}</String>
+            <String>/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/LeakDetection/LeakDetectors/{LeakDetectorId}</String>
           </Collection>
         </Annotation>
       </EntityType>
@@ -235,5 +244,18 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LeakDetector.v1_3_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="LeakDetector" BaseType="LeakDetector.v1_2_0.LeakDetector">
+        <Property Name="Enabled" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates whether the leak detector is enabled and provides a status."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the leak detector is enabled and provides a `DetectorState`.  The value `true` shall indicate the leak detector is enabled and returns the `DetectorState` property with a valid value.  The value `false` shall indicate the leak detector is disabled, shall not return the `DetectorState` property, and shall not trigger events, logging, or other functionality.  This property allows a user to disable a faulty leak detector or to otherwise remove it from use."/>
+        </Property>
+      </EntityType>
+    </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 7aa3241..e8d0d8d 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.2                                                     -->
+<!--# Redfish Schema:  Manager 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                                   -->
@@ -111,7 +111,7 @@
 
       <Action Name="Reset" IsBound="true">
         <Annotation Term="OData.Description" String="The reset action resets/reboots the manager."/>
-        <Annotation Term="OData.LongDescription" String="This action shall reset the manager."/>
+        <Annotation Term="OData.LongDescription" String="This action shall reset the manager.  If this manager provides the Redfish service, the service shall send the action response before resetting to prevent client timeouts."/>
         <Parameter Name="Manager" Type="Manager.v1_0_0.Actions"/>
         <Parameter Name="ResetType" Type="Resource.ResetType">
           <Annotation Term="OData.Description" String="The type of reset."/>
@@ -547,6 +547,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_0_18.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_0_20">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_0_19.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"/>
@@ -665,6 +671,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_1_16.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_1_18">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_1_17.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"/>
@@ -780,6 +792,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_2_16.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_2_18">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_2_17.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"/>
@@ -890,6 +908,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_3_15.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_3_17">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_3_16.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"/>
@@ -990,6 +1014,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_4_12.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_4_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_4_13.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"/>
@@ -1082,6 +1112,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_5_11.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_5_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_5_12.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"/>
@@ -1158,6 +1194,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_6_8.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_6_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_6_9.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"/>
@@ -1235,6 +1277,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_7_8.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_7_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_7_9.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"/>
@@ -1303,6 +1351,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_8_7.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_8_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_8_8.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"/>
@@ -1373,6 +1427,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_9_6.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_9_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_9_7.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"/>
@@ -1423,6 +1483,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_10_5.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_10_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_10_6.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"/>
@@ -1475,6 +1541,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_11_4.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_11_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_11_5.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"/>
@@ -1511,6 +1583,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_12_3.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_12_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_12_4.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"/>
@@ -1556,6 +1634,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_13_2.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_13_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_13_3.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"/>
@@ -1588,6 +1672,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_14_2.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_14_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_14_3.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"/>
@@ -1623,6 +1713,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_15_2.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_15_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_15_3.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"/>
@@ -1662,6 +1758,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_16_2.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_16_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_16_3.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"/>
@@ -1693,6 +1795,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_17_2.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_17_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_17_3.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"/>
@@ -1726,6 +1834,12 @@
       <EntityType Name="Manager" BaseType="Manager.v1_18_2.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_18_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_18_3.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"/>
@@ -1776,5 +1890,42 @@
       <EntityType Name="Manager" BaseType="Manager.v1_19_1.Manager"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_19_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description the `Reset` action to state that a response is required before resetting to avoid client timeouts."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_19_2.Manager"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_20_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="Manager" BaseType="Manager.v1_19_3.Manager">
+        <Property Name="DateTimeSource" Type="Manager.v1_20_0.DateTimeSource">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The source of the date and time of this manager, such as NTP, RTC, or firmware."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the source of the `DateTime` property of this manager.  The service shall update this property if the source changes internally, for example if an NTP server is unavailable and the source falls back to the time stored by the RTC."/>
+        </Property>
+      </EntityType>
+
+      <EnumType Name="DateTimeSource">
+        <Member Name="RTC">
+          <Annotation Term="OData.Description" String="The date and time is retrieved from the manager's real time clock (RTC)."/>
+        </Member>
+        <Member Name="Firmware">
+          <Annotation Term="OData.Description" String="The date and time is set and held by firmware."/>
+        </Member>
+        <Member Name="Host">
+          <Annotation Term="OData.Description" String="The date and time is retrieved from the host."/>
+        </Member>
+        <Member Name="NTP">
+          <Annotation Term="OData.Description" String="The date and time source is a Network Time Protocol (NTP) server."/>
+        </Member>
+        <Member Name="PTP">
+          <Annotation Term="OData.Description" String="The date and time source is a Precision Time Protocol (PTP) server."/>
+        </Member>
+      </EnumType>
+    </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 e545483..eab3307 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.16.0                                                  -->
+<!--# Redfish Schema:  PCIeDevice 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                                   -->
@@ -788,6 +788,17 @@
         <Member Name="U2">
           <Annotation Term="OData.Description" String="U.2 / SFF-8639 slot or bay."/>
         </Member>
+        <Member Name="EDSFF">
+          <Annotation Term="OData.Description" String="EDSFF slot."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_17_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <EnumType Name="LaneSplittingType">
@@ -1156,9 +1167,18 @@
     <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"/>
+      <Annotation Term="OData.Description" String="This version was created to add `Gen6` to `PCIeType` and `MaxPCIeType`."/>
 
       <EntityType Name="PCIeDevice" BaseType="PCIeDevice.v1_15_0.PCIeDevice"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PCIeDevice.v1_17_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add `EDSFF` to `SlotType`."/>
+
+      <EntityType Name="PCIeDevice" BaseType="PCIeDevice.v1_16_0.PCIeDevice"/>
+    </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 f234731..f3d251a 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.14.0                                                        -->
+<!--# Redfish Schema:  Port 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                                   -->
@@ -157,17 +157,8 @@
         </Property>
         <Property Name="PortId" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The label of this port on the physical package for this port."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the name of the port as indicated on the device containing the port."/>
-          <Annotation Term="Redfish.Revisions">
-            <Collection>
-              <Record>
-                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
-                <PropertyValue Property="Version" String="v1_12_0"/>
-                <PropertyValue Property="Description" String="This property has been deprecated in favor of `Location` and `ServiceLabel`."/>
-              </Record>
-            </Collection>
-          </Annotation>
+          <Annotation Term="OData.Description" String="The hardware-defined identifier of this port."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the hardware-defined identifier of this port.  The human-readable name of this port is described in the `ServiceLabel` property within `Location` for this port."/>
         </Property>
         <Property Name="PortProtocol" Type="Protocol.Protocol">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -1910,6 +1901,12 @@
       <EntityType Name="Port" BaseType="Port.v1_11_1.Port"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_12_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to remove the deprecation of `PortId` and add clarifications to the description of `PortId`."/>
+      <EntityType Name="Port" BaseType="Port.v1_12_0.Port"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.2"/>
@@ -1931,6 +1928,12 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_13_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to remove the deprecation of `PortId` and add clarifications to the description of `PortId`."/>
+      <EntityType Name="Port" BaseType="Port.v1_13_0.Port"/>
+    </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"/>
@@ -1946,5 +1949,39 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_14_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to remove the deprecation of `PortId` and add clarifications to the description of `PortId`."/>
+      <EntityType Name="Port" BaseType="Port.v1_14_0.Port"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_15_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="Port" BaseType="Port.v1_14_1.Port">
+        <Property Name="HostDevice" Type="Port.v1_15_0.HostDeviceType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The current host device for this port."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current host device of port."/>
+        </Property>
+      </EntityType>
+
+      <EnumType Name="HostDeviceType">
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="The port is not connected to any host device."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the port is not connected to any host device."/>
+        </Member>
+        <Member Name="System">
+          <Annotation Term="OData.Description" String="The port is connected to a computer system device."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the port is connected to a computer system device."/>
+        </Member>
+        <Member Name="Manager">
+          <Annotation Term="OData.Description" String="The port is connected to a manager device."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the port is connected to a manager device."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/PowerSubsystem_v1.xml b/redfish-core/schema/dmtf/csdl/PowerSubsystem_v1.xml
index f59b740..3dcdac5 100644
--- a/redfish-core/schema/dmtf/csdl/PowerSubsystem_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/PowerSubsystem_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  PowerSubsystem v1.1.2                                               -->
+<!--# Redfish Schema:  PowerSubsystem v1.1.3                                               -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -88,8 +88,8 @@
           <Annotation Term="Measures.Unit" String="W"/>
         </Property>
         <Property Name="Allocation" Type="PowerSubsystem.v1_0_0.PowerAllocation" Nullable="false">
-          <Annotation Term="OData.Description" String="Power allocation for this subsystem."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the set of properties describing the allocation of power for this subsystem."/>
+          <Annotation Term="OData.Description" String="Power allocation for this subsystem when it represents a subset of the power infrastructure for the chassis or its upstream chassis, such as a chassis containing multiple server blades."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the set of properties describing the allocation of power for this subsystem as part of the power infrastructure for the chassis or an upstream chassis.  This property should not be present in resources that are not part of a shared power infrastructure."/>
         </Property>
         <NavigationProperty Name="PowerSupplies" Type="PowerSupplyCollection.PowerSupplyCollection" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -155,6 +155,12 @@
       <EntityType Name="PowerSubsystem" BaseType="PowerSubsystem.v1_0_1.PowerSubsystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PowerSubsystem.v1_0_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that the `Allocation` object is intended for use with products which incorporate a shared power infrastructures."/>
+      <EntityType Name="PowerSubsystem" BaseType="PowerSubsystem.v1_0_2.PowerSubsystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PowerSubsystem.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -181,5 +187,11 @@
       <EntityType Name="PowerSubsystem" BaseType="PowerSubsystem.v1_1_1.PowerSubsystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PowerSubsystem.v1_1_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that the `Allocation` object is intended for use with products which incorporate a shared power infrastructures."/>
+      <EntityType Name="PowerSubsystem" BaseType="PowerSubsystem.v1_1_2.PowerSubsystem"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Pump_v1.xml b/redfish-core/schema/dmtf/csdl/Pump_v1.xml
index 2c10bc4..56d4d5a 100644
--- a/redfish-core/schema/dmtf/csdl/Pump_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Pump_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Pump v1.1.0                                                         -->
+<!--# Redfish Schema:  Pump 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                                   -->
@@ -86,6 +86,24 @@
           </Collection>
         </Annotation>
       </EntityType>
+
+      <Action Name="SetMode" IsBound="true">
+        <Annotation Term="OData.Description" String="This action sets the operating mode of the pump."/>
+        <Annotation Term="OData.LongDescription" String="This action shall set the operating mode of the pump."/>
+        <Parameter Name="Pump" Type="Pump.v1_0_0.Actions"/>
+        <Parameter Name="Mode" Type="Pump.v1_2_0.PumpMode">
+          <Annotation Term="OData.Description" String="The desired operating mode of the pump."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the desired operating mode of the pump."/>
+        </Parameter>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_2_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Pump.v1_0_0">
@@ -248,5 +266,31 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Pump.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add the `SetMode` action."/>
+
+      <EntityType Name="Pump" BaseType="Pump.v1_1_0.Pump">
+        <NavigationProperty Name="InletPressurekPa" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="The inlet pressure (kPa)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the pressure, in kilopascal units, for the inlet to this pump.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `PressurekPa`."/>
+        </NavigationProperty>
+      </EntityType>
+
+      <EnumType Name="PumpMode">
+        <Member Name="Enabled">
+          <Annotation Term="OData.Description" String="Enable the pump."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a request to enable the pump.  Upon successful completion, the `State` property within `Status`, shall contain the value `Enabled`."/>
+        </Member>
+        <Member Name="Disabled">
+          <Annotation Term="OData.Description" String="Disable the pump."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a request to disable the pump.  Upon successful completion, the `State` property within `Status`, shall contain the value `Disabled`."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Redundancy_v1.xml b/redfish-core/schema/dmtf/csdl/Redundancy_v1.xml
index 754644d..0070405 100644
--- a/redfish-core/schema/dmtf/csdl/Redundancy_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Redundancy_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Redundancy v1.4.2                                                   -->
+<!--# Redfish Schema:  Redundancy v1.5.0                                                   -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -444,5 +444,20 @@
       <ComplexType Name="RedundantGroup" BaseType="Redundancy.v1_4_1.RedundantGroup"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Redundancy.v1_5_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="Redundancy" BaseType="Redundancy.v1_4_2.Redundancy"/>
+
+      <ComplexType Name="RedundantGroup" BaseType="Redundancy.v1_4_2.RedundantGroup">
+        <Property Name="GroupName" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description"  String="The name of the redundant group."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the name of the redundant group used to identify the particular group of redundant resources.  The value shall conform with the 'Name' clause of the Redfish Specification."/>
+        </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 e4c3781..c35230d 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.20.0                                                    -->
+<!--# Redfish Schema:  Resource v1.21.0                                                    -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -118,7 +118,7 @@
         </Property>
         <Property Name="Conditions" Type="Collection(Resource.Condition)">
           <Annotation Term="OData.Description" String="Conditions in this resource that require attention."/>
-          <Annotation Term="OData.LongDescription" String="This property shall represent the active conditions requiring attention in this or a related resource that affects the `Health` or `HealthRollup` of this resource.  The service may roll up multiple conditions originating from a resource, using the `ConditionInRelatedResource` message from the Base Message Registry.  The array order of conditions may change as new conditions occur or as conditions are resolved by the service."/>
+          <Annotation Term="OData.LongDescription" String="This property shall represent the active conditions requiring attention in this or a related resource.  The conditions may affect the `Health` or `HealthRollup` of this resource.  The service may roll up multiple conditions originating from a resource, using the `ConditionInRelatedResource` message from the Base Message Registry.  The array order of conditions may change as new conditions occur or as conditions are resolved by the service."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -228,6 +228,18 @@
             </Collection>
           </Annotation>
         </Property>
+        <Property Name="Oem" Type="Resource.Oem" Nullable="false">
+          <Annotation Term="OData.Description" String="The OEM extension property."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_21_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Property>
       </ComplexType>
 
       <EnumType Name="State">
@@ -384,8 +396,8 @@
           <Annotation Term="OData.LongDescription" String="This value shall indicate the resource will behave as if the physical power button is pressed.  The behavior of pressing the physical power button may be dependent on the state of the unit and the behavior may be configurable."/>
         </Member>
         <Member Name="PowerCycle">
-          <Annotation Term="OData.Description" String="Power cycle the unit.  Behaves like a full power removal, followed by a power restore to the resource."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate the resource will perform a power cycle.  If currently in the power on state, the resource will transition to a power off state, then transition to a power on state.  If currently in the power off state, the resource will transition to a power on state.  Upon successful completion, the `PowerState` property, if supported, shall contain the value `On`."/>
+          <Annotation Term="OData.Description" String="Power cycle the unit.  Behaves like a power removal, followed by a power restore to the resource."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the resource will perform a power cycle.  This is different from `FullPowerCycle` in that it typically performs localized power sequencing of the resource while external power is still present.  For example, turning DC voltage regulators off and then turning DC voltage regulators back on.  If currently in the power on state, the resource will transition to a power off state, then transition to a power on state.  If currently in the power off state, the resource will transition to a power on state.  Upon successful completion, the `PowerState` property, if supported, shall contain the value `On`."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -431,6 +443,18 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="FullPowerCycle">
+          <Annotation Term="OData.Description" String="Full power cycle the unit.  Behaves like removing utility lines, followed by restoring utility lines to the resource."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the resource will perform a full power cycle as if utility lines to the resource are removed and restored.  This is different from `PowerCycle` in that it's as close to a true power cycle as possible.  For example, removing AC power cables from an enclosure and then restoring the AC power cables.  If currently in the power on state, the resource will transition to a power off state, then transition to a power on state.  If currently in the power off state, the resource will transition to a power on state.  Upon successful completion, the `PowerState` property, if supported, shall contain the value `On`.  If a service supports this value but there are no other distinct power cycle flows, the service shall support `PowerCycle` as an alias to `FullPowerCycle`.  This type of reset may cause the manager providing the Redfish service to power cycle.  If the manager providing the Redfish service is affected by this type of reset, the service shall send the action response before resetting to prevent client timeouts."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_21_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <ComplexType Name="Identifier" Abstract="true">
@@ -850,7 +874,7 @@
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
-      <Annotation Term="OData.Description" String="This version moves the former definition of PowerState to the unversioned namespace."/>
+      <Annotation Term="OData.Description" String="This version moves the former definition of `PowerState` to the unversioned namespace."/>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_2_1">
@@ -1269,7 +1293,7 @@
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
-      <Annotation Term="OData.Description" String="This version was created to add PowerCycle enumeration to ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to add the `PowerCycle` enumeration to `ResetType`."/>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_4_1">
@@ -1997,6 +2021,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_11_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `Conditions` may include conditions that require attention but do not necessarily affect the `Health` or `HealthRollup` of the resource."/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -2033,10 +2062,15 @@
       <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_12_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `Conditions` may include conditions that require attention but do not necessarily affect the `Health` or `HealthRollup` of the resource."/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
-      <Annotation Term="OData.Description" String="This version was created to add `Embedded` to `LocationType` within `PartLocation`.  It was also created to add the `Pause`, `Resume`, and `Suspend` enumerations to ResetType.  It was also created to add `Paused` to PowerState."/>
+      <Annotation Term="OData.Description" String="This version was created to add `Embedded` to `LocationType` within `PartLocation`.  It was also created to add the `Pause`, `Resume`, and `Suspend` enumerations to `ResetType`.  It was also created to add `Paused` to `PowerState`."/>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_13_1">
@@ -2064,6 +2098,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_13_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `Conditions` may include conditions that require attention but do not necessarily affect the `Health` or `HealthRollup` of the resource."/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_14_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -2090,6 +2129,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_14_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `Conditions` may include conditions that require attention but do not necessarily affect the `Health` or `HealthRollup` of the resource."/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_15_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -2111,6 +2155,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_15_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `Conditions` may include conditions that require attention but do not necessarily affect the `Health` or `HealthRollup` of the resource."/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_16_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -2139,6 +2188,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_16_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `Conditions` may include conditions that require attention but do not necessarily affect the `Health` or `HealthRollup` of the resource."/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_17_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -2209,6 +2263,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_17_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `Conditions` may include conditions that require attention but do not necessarily affect the `Health` or `HealthRollup` of the resource."/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_18_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -2225,6 +2284,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_18_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `Conditions` may include conditions that require attention but do not necessarily affect the `Health` or `HealthRollup` of the resource."/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_19_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -2236,11 +2300,27 @@
       <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_19_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `Conditions` may include conditions that require attention but do not necessarily affect the `Health` or `HealthRollup` of the resource."/>
+    </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>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_20_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `Conditions` may include conditions that require attention but do not necessarily affect the `Health` or `HealthRollup` of the resource."/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_21_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add the `FullPowerCycle` enumeration to `ResetType`.  It was also created to add the `Oem` property to the `Condition` property in `Status`."/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Role_v1.xml b/redfish-core/schema/dmtf/csdl/Role_v1.xml
index 446db7c..d315b4d 100644
--- a/redfish-core/schema/dmtf/csdl/Role_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Role_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Role v1.3.2                                                         -->
+<!--# Redfish Schema:  Role v1.3.3                                                         -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -69,7 +69,7 @@
         <Property Name="IsPredefined" Type="Edm.Boolean" Nullable="false" DefaultValue="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="An indication of whether the role is predefined by Redfish or an OEM rather than a client-defined role."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the role is predefined by Redfish or an OEM as contrasted with a client-defined role."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the role is predefined by Redfish or an OEM as contrasted with a client-defined role.  If this property is not present, the value should be assumed to be `false`."/>
         </Property>
         <Property Name="AssignedPrivileges" Type="Collection(Privileges.PrivilegeType)" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -132,6 +132,12 @@
       <EntityType Name="Role" BaseType="Role.v1_0_8.Role"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Role.v1_0_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend assuming `IsPredefined` to be `false` if not present."/>
+      <EntityType Name="Role" BaseType="Role.v1_0_9.Role"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Role.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -202,16 +208,23 @@
       <EntityType Name="Role" BaseType="Role.v1_1_6.Role"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Role.v1_1_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend assuming `IsPredefined` to be `false` if not present."/>
+      <EntityType Name="Role" BaseType="Role.v1_1_7.Role"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Role.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.2"/>
 
       <EntityType Name="Role" BaseType="Role.v1_1_0.Role">
         <Property Name="RoleId" Type="Edm.String" Nullable="false">
-          <Annotation Term="Redfish.RequiredOnCreate"/>
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The name of the role."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the string name of the role.  This property shall contain the same value as the `Id` property."/>
+          <Annotation Term="Redfish.Required"/>
+          <Annotation Term="Redfish.RequiredOnCreate"/>
         </Property>
       </EntityType>
     </Schema>
@@ -258,6 +271,12 @@
       <EntityType Name="Role" BaseType="Role.v1_2_6.Role"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Role.v1_2_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend assuming `IsPredefined` to be `false` if not present.  It was also created to indicate `RoleId` is a required property."/>
+      <EntityType Name="Role" BaseType="Role.v1_2_7.Role"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Role.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -288,5 +307,11 @@
       <EntityType Name="Role" BaseType="Role.v1_3_1.Role"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Role.v1_3_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend assuming `IsPredefined` to be `false` if not present.  It was also created to indicate `RoleId` is a required property."/>
+      <EntityType Name="Role" BaseType="Role.v1_3_2.Role"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/SecurityPolicy_v1.xml b/redfish-core/schema/dmtf/csdl/SecurityPolicy_v1.xml
index 4933912..236affb 100644
--- a/redfish-core/schema/dmtf/csdl/SecurityPolicy_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/SecurityPolicy_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  SecurityPolicy v1.0.2                                               -->
+<!--# Redfish Schema:  SecurityPolicy v1.0.3                                               -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -190,14 +190,15 @@
         <Annotation Term="OData.Description" String="The TLS client and server policies."/>
         <Annotation Term="OData.LongDescription" String="This property shall contain the policy requirements for TLS communication and usage for a TLS client and server."/>
         <Property Name="Client" Type="SecurityPolicy.v1_0_0.TLSPolicy" Nullable="false">
-          <Annotation Term="OData.Description" String="The TLS policy."/>
+          <Annotation Term="OData.Description" String="The TLS policy where the manager acts as a TLS client for communication with servers."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the policy requirements and usage for TLS connections where the manager acts as a TLS client."/>
         </Property>
         <Property Name="Server" Type="SecurityPolicy.v1_0_0.TLSPolicy" Nullable="false">
-          <Annotation Term="OData.Description" String="The TLS policy."/>
+          <Annotation Term="OData.Description" String="The TLS policy where the manager acts as a TLS server for communication with clients."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the policy requirements and usage for TLS connections where the manager acts as a TLS server."/>
         </Property>
       </ComplexType>
+
       <ComplexType Name="TLSPolicy">
         <Annotation Term="OData.AdditionalProperties" Bool="false"/>
         <Annotation Term="OData.Description" String="TLS policy settings."/>
@@ -272,5 +273,11 @@
       <EntityType Name="SecurityPolicy" BaseType="SecurityPolicy.v1_0_1.SecurityPolicy"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SecurityPolicy.v1_0_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the `Client` and `Server` properties within the `TLS` property."/>
+      <EntityType Name="SecurityPolicy" BaseType="SecurityPolicy.v1_0_2.SecurityPolicy"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/SessionService_v1.xml b/redfish-core/schema/dmtf/csdl/SessionService_v1.xml
index d26f015..1da7111 100644
--- a/redfish-core/schema/dmtf/csdl/SessionService_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/SessionService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  SessionService v1.1.9                                               -->
+<!--# Redfish Schema:  SessionService 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                                   -->
@@ -232,5 +232,26 @@
       <EntityType Name="SessionService" BaseType="SessionService.v1_1_8.SessionService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SessionService.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="SessionService" BaseType="SessionService.v1_1_9.SessionService">
+        <Property Name="AbsoluteSessionTimeout" Type="Edm.Int64" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The maximum number of seconds that a session is open before the service closes the session regardless of activity."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the maximum number of seconds that a session is open before the service closes the session regardless of activity."/>
+          <Annotation Term="Validation.Minimum" Int="30"/>
+          <Annotation Term="Validation.Maximum" Int="86400"/>
+          <Annotation Term="Measures.Unit" String="s"/>
+        </Property>
+        <Property Name="AbsoluteSessionTimeoutEnabled" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="An indication of whether an absolute session timeout is applied to sessions."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether an absolute session timeout is applied to sessions.  If `true`, the service shall close sessions that are open for the number of seconds specified by the `AbsoluteSessionTimeout` property regardless of session activity.  If `false` or if this property is not present, the service shall not apply an absolute session timeout."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Session_v1.xml b/redfish-core/schema/dmtf/csdl/Session_v1.xml
index 518e79b..cd99d58 100644
--- a/redfish-core/schema/dmtf/csdl/Session_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Session_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Session v1.7.2                                                      -->
+<!--# Redfish Schema:  Session 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                                   -->
@@ -495,5 +495,18 @@
       <EntityType Name="Session" BaseType="Session.v1_7_1.Session"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Session.v1_8_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="Session" BaseType="Session.v1_7_2.Session">
+        <Property Name="ExpirationTime" Type="Edm.DateTimeOffset" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The date and time when the session expires regardless of session activity."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the date and time when the session expires regardless of session activity.  The service shall delete this resource when the expiration time is reached.  If this property is not present, the session does not expire based on an absolute time."/>
+        </Property>
+      </EntityType>
+    </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 b552021..b80bb3f 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.8.0                                            -->
+<!--# Redfish Schema:  StorageController 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                                   -->
@@ -912,5 +912,20 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="StorageController.v1_9_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="StorageController" BaseType="StorageController.v1_8_0.StorageController"/>
+
+      <ComplexType Name="NVMeControllerProperties" BaseType="StorageController.v1_8_0.NVMeControllerProperties">
+        <Property Name="DiscoveryTransportServiceId" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The NVMe discovery transport service identifier for the discovery controller."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the NVMe discovery transport service identifier for the discovery controller.  This property shall only be present if `ControllerType` contains `Discovery`.  For NVMe/TCP, the default value should be `8009`."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/StorageMetrics_v1.xml b/redfish-core/schema/dmtf/csdl/StorageMetrics_v1.xml
new file mode 100644
index 0000000..bf58a13
--- /dev/null
+++ b/redfish-core/schema/dmtf/csdl/StorageMetrics_v1.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################               -->
+<!--# Redfish Schema:  StorageMetrics v1.0.0                                                       -->
+<!--#                                                                                              -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,              -->
+<!--# available at http://www.dmtf.org/standards/redfish                                           -->
+<!--# Copyright 2014-2024 DMTF in cooperation with Storage Networking Industry Association (SNIA). -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright         -->
+<!--################################################################################               -->
+<!---->
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
+
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Storage_v1.xml">
+    <edmx:Include Namespace="Storage"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/IOStatistics_v1.xml">
+    <edmx:Include Namespace="IOStatistics"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Measures.V1.xml">
+    <edmx:Include Namespace="Org.OData.Measures.V1" Alias="Measures"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="StorageMetrics">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Language" String="en"/>
+
+      <EntityType Name="StorageMetrics" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The usage and health statistics for a storage subsystem."/>
+        <Annotation Term="OData.LongDescription" String="The `StorageMetrics` schema shall contain the usage and health statistics for a storage subsystem in a Redfish implementation."/>
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Storage/{StorageId}/Metrics</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Metrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Metrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Metrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Metrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Metrics</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="StorageMetrics.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="StorageMetrics" BaseType="StorageMetrics.StorageMetrics">
+        <Property Name="Actions" Type="StorageMetrics.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+        <Property Name="CompressionSavingsBytes" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Current compression savings on the storage system in bytes."/>
+          <Annotation Term="OData.LongDescription" String="The value shall represent the current compression savings on the storage system in bytes."/>
+          <Annotation Term="Measures.Unit" String="By"/>
+        </Property>
+        <Property Name="DeduplicationSavingsBytes" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Current deduplication savings on the storage system in bytes."/>
+          <Annotation Term="OData.LongDescription" String="The value shall represent the current deduplication savings on the storage system in bytes."/>
+          <Annotation Term="Measures.Unit" String="By"/>
+        </Property>
+        <Property Name="ThinProvisioningSavingsBytes" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Current thin provisioning savings on the storage system in bytes."/>
+          <Annotation Term="OData.LongDescription" String="The value shall represent the current thin provisioning savings on the storage system in bytes."/>
+          <Annotation Term="Measures.Unit" String="By"/>
+        </Property>
+        <Property Name="IOStatistics" Type="IOStatistics.IOStatistics" Nullable="false">
+          <Annotation Term="OData.Description" String="Statistics for this storage system."/>
+          <Annotation Term="OData.LongDescription" String="The value shall contain the I/O statistics for this storage system."/>
+        </Property>
+        <Property Name="StateChangeCount" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The number of state changes for this storage subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of times the `State` property within the `Status` property of the parent `Storage` resource changed."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="StorageMetrics.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </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 90501cd..d4a0e5f 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.1                                                                 -->
+<!--# Redfish Schema:  Storage v1.18.0                                                                 -->
 <!--#                                                                                                  -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,                  -->
 <!--# available at http://www.dmtf.org/standards/redfish                                               -->
@@ -97,6 +97,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ConnectionCollection_v1.xml">
     <edmx:Include Namespace="ConnectionCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/StorageMetrics_v1.xml">
+    <edmx:Include Namespace="StorageMetrics"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -1815,5 +1818,39 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_17_0.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_18_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+
+      <EntityType Name="Storage" BaseType="Storage.v1_17_1.Storage">
+        <Property Name="BlockSecurityIDPolicy" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates if the storage controller sends a command to block establishment of a TCG-defined security ID (SID) during each drive boot sequence for drives that support it."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if the storage controller sends the TCG-defined 'Block SID' command to block establishment of a TCG-defined security ID (SID) during each drive boot sequence for drives that support it.  The value `true` shall indicate the TCG-defined 'Block SID' command is sent to supporting drives during each drive boot sequence."/>
+        </Property>
+        <NavigationProperty Name="Metrics" Type="StorageMetrics.StorageMetrics">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the metrics associated with this storage subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `StorageMetrics` that represents the metrics associated with this storage subsystem."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+
+      <ComplexType Name="Links" BaseType="Storage.v1_15_0.Links">
+        <NavigationProperty Name="BlockSecurityIDUnsupportedDrives" Type="Collection(Drive.Drive)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The set of drives in this storage subsystem that do not support blocking of TCG-defined security ID (SID)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Drive` that represent the drives in this storage subsystem that do not support the TCG-defined 'Block SID' command.  This property should only be present if at least one drive does not support the TCG-defined 'Block SID' command."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="BlockSecurityIDUpdateUnsuccessfulDrives" Type="Collection(Drive.Drive)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The set of drives in this storage subsystem for which the most recent attempt to block TCG-defined security ID (SID) failed."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `Drive` that represent the drives in this storage subsystem for which the most recent attempt to block TCG-defined security ID (SID) with the TCG-defined 'Block SID' command failed.  This property should only be present if the most recent attempt to block TCG-defined security ID (SID) with the TCG-defined 'Block SID' command failed for at least one drive."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/ThermalSubsystem_v1.xml b/redfish-core/schema/dmtf/csdl/ThermalSubsystem_v1.xml
index 5a00614..c282372 100644
--- a/redfish-core/schema/dmtf/csdl/ThermalSubsystem_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ThermalSubsystem_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ThermalSubsystem v1.3.2                                             -->
+<!--# Redfish Schema:  ThermalSubsystem v1.3.3                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -210,7 +210,7 @@
         <NavigationProperty Name="LeakDetection" Type="LeakDetection.LeakDetection" ContainsTarget="true" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The link to the leak detection system within this chassis."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `LeakDetection`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type `LeakDetection`.  This link should be used when the leak detection capabilities are tied to, or are internal to, a particular `Chassis`.  For detection capabilties that are tied to a `CoolingUnit` resource, which may span multiple `Chassis` resources, populating the `LeakDetection` resource under `CoolingUnit` for the relevant equipment is the preferred approach."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
       </EntityType>
@@ -228,5 +228,11 @@
       <EntityType Name="ThermalSubsystem" BaseType="ThermalSubsystem.v1_3_1.ThermalSubsystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ThermalSubsystem.v1_3_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of `LeakDetection` in single-chassis equipments as compared to multi-chassis cooling equipment."/>
+      <EntityType Name="ThermalSubsystem" BaseType="ThermalSubsystem.v1_3_2.ThermalSubsystem"/>
+    </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 7c2a5dd..45a03f1 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.1                                               -->
+<!--# Redfish Schema:  UpdateService 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                                   -->
@@ -383,6 +383,15 @@
           <Annotation Term="OData.Description" String="The URI used to perform an HTTP or HTTPS push update to the update service.  The format of the message is vendor-specific."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain a URI at which the update service supports an HTTP or HTTPS `POST` of a software image for the purpose of installing software contained within the image.  Access to this URI shall require the same privilege as access to the update service.  If the service requires the `Content-Length` header for `POST` requests to this URI, the service should return HTTP `411 Length Required` status code if the client does not include this header in the `POST` request.  The value of this property should not contain a URI of a Redfish resource.  See the 'Redfish-defined URIs and relative reference rules' clause in the Redfish Specification."/>
           <Annotation Term="OData.IsURL"/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_15_0"/>
+                <PropertyValue Property="Description" String="This property has been deprecated in favor of the `MultipartHttpPushUri` property."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Property>
       </EntityType>
     </Schema>
@@ -475,11 +484,29 @@
           <Annotation Term="OData.Description" String="An array of URIs that indicate where to apply the update image."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain zero or more URIs that indicate where to apply the update image when using the URI specified by the `HttpPushUri` property to push a software image.  These targets should correspond to software inventory instances or their related items.  If this property is not present or contains no targets, the service shall apply the software image to all applicable targets, as determined by the service.  If the target specifies a device resource, the software image file shall be applied to the specified device.  If the target specifies a resource collection, the software image shall be applied to each applicable member of the specified collection.  If the target resource specifies an `Aggregate` resource, the software image file shall be applied to each applicable element of the specified aggregate.  If the target resource specifies a `ComputerSystem` resource, the software image file shall be applied to the applicable components within the specified computer system."/>
           <Annotation Term="OData.IsURL"/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_15_0"/>
+                <PropertyValue Property="Description" String="This property has been deprecated in favor of the update parameters used with `MultipartHttpPushUri`-provided software updates."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Property>
         <Property Name="HttpPushUriTargetsBusy" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="An indication of whether any client has reserved the `HttpPushUriTargets` property."/>
           <Annotation Term="OData.LongDescription" String="This property shall indicate whether any client has reserved the `HttpPushUriTargets` property for firmware updates.  A client should set this property to `true` when it uses `HttpPushUriTargets` for firmware updates.  A client should set it to `false` when it no longer uses `HttpPushUriTargets` for updates.  The property can provide multiple clients a way to negotiate ownership of `HttpPushUriTargets` and helps clients determine whether another client is using `HttpPushUriTargets` to make firmware updates.  This property has no functional requirements for the service."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_15_0"/>
+                <PropertyValue Property="Description" String="This property has been deprecated in favor of `MultipartHttpPushUri`-provided software updates."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Property>
       </EntityType>
     </Schema>
@@ -657,11 +684,29 @@
         <Property Name="HttpPushUriOptions" Type="UpdateService.v1_4_0.HttpPushUriOptions" Nullable="false">
           <Annotation Term="OData.Description" String="The options for `HttpPushUri`-provided software updates."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain options and requirements of the service for `HttpPushUri`-provided software updates."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_15_0"/>
+                <PropertyValue Property="Description" String="This property has been deprecated in favor of the update parameters used with `MultipartHttpPushUri`-provided software updates."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Property>
         <Property Name="HttpPushUriOptionsBusy" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="An indication of whether a client has reserved the `HttpPushUriOptions` properties for software updates."/>
           <Annotation Term="OData.LongDescription" String="This property shall indicate whether a client uses the `HttpPushUriOptions` properties for software updates.  When a client uses any `HttpPushUriOptions` properties for software updates, it should set this property to `true`.  When a client no longer uses `HttpPushUriOptions` properties for software updates, it should set this property to `false`.  This property can provide multiple clients a way to negotiate ownership of `HttpPushUriOptions` properties.  Clients can use this property to determine whether another client uses `HttpPushUriOptions` properties for software updates.  This property has no functional requirements for the service."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_15_0"/>
+                <PropertyValue Property="Description" String="This property has been deprecated in favor of `MultipartHttpPushUri`-provided software updates."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Property>
       </EntityType>
 
@@ -1407,5 +1452,13 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_14_0.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_15_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.4"/>
+      <Annotation Term="OData.Description" String="This version was created to deprecate `HttpPushUri`, `HttpPushUriTargets`, `HttpPushUriTargetsBusy`, `HttpPushUriOptions`, and `HttpPushUriOptionsBusy` properties in favor of `MultipartHttpPushUri`."/>
+
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_14_1.UpdateService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Volume_v1.xml b/redfish-core/schema/dmtf/csdl/Volume_v1.xml
index 8ae23da..bba8c53 100644
--- a/redfish-core/schema/dmtf/csdl/Volume_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Volume_v1.xml
@@ -64,7 +64,6 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/IOStatistics_v1.xml">
     <edmx:Include Namespace="IOStatistics"/>
-    <edmx:Include Namespace="IOStatistics.v1_0_1"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/SpareResourceSet_v1.xml">
     <edmx:Include Namespace="SpareResourceSet"/>
@@ -1037,7 +1036,7 @@
       <EntityType Name="Volume" BaseType="Volume.v1_1_1.Volume">
         <Annotation Term="OData.Description" String="Add volume statistics."/>
 
-        <Property Name="IOStatistics" Type="IOStatistics.v1_0_1.IOStatistics" Nullable="false">
+        <Property Name="IOStatistics" Type="IOStatistics.IOStatistics" Nullable="false">
           <Annotation Term="OData.Description" String="Statistics for this volume."/>
           <Annotation Term="OData.LongDescription" String="The value shall represent IO statistics for this volume."/>
           <Annotation Term="Redfish.Revisions">
@@ -1102,6 +1101,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_2_4.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_2_6">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change IOStatistics references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_2_5.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="1.0.6a"/>
@@ -1167,6 +1172,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_3_3.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_3_5">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change IOStatistics references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_3_4.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="1.1.0"/>
@@ -1291,6 +1302,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_4_2.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_4_4">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change IOStatistics references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_4_3.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="1.2.0"/>
@@ -1413,6 +1430,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_5_0.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_5_2">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change IOStatistics references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_5_1.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="1.2.1"/>
@@ -1454,6 +1477,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_6_0.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_6_3">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change IOStatistics references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_6_2.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="OData.Description" String="This version was created to add the IsBootCapable property."/>
@@ -1469,6 +1498,12 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_7_1">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change IOStatistics references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_7_0.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="OData.Description" String="This version was created to add the LBAFormatsSupported and Type properties to NVMeNamespaceProperties. It also adds IsBound=true to Actions where missing."/>
@@ -1496,6 +1531,12 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_8_1">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change IOStatistics references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_8_0.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="OData.Description" String="This version add support for NamespaceTypes and Volume Metrics. It also adds a Link to Controllers (StorageControllers), and adds Operation type to Volume, deprecating OperationName, and removes the erroneous AutoExpandReferences from the RemoteReplicaTargets property. It adds Connections, and deprecates StorageGroups. It also adds ReplicationEnabled."/>
@@ -1590,6 +1631,12 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_9_1">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change IOStatistics references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_9_0.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="OData.Description" String="This version was created to add ChangeStripSize to the OperationType enum, add the ALUA property for Reservations, and add ProvidingStoragePool to Links. It adds SupportsMultipleNamespaceAttachments and SupportsIOPerformanceHints to NVMeNamespaceProperties. It also deprecates IOStatistics in favor of IOStatistics in VolumeMetrics."/>
@@ -1634,5 +1681,12 @@
       </ComplexType>
 
     </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_10_1">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+     <Annotation Term="OData.LongDescription" String="Change IOStatistics references to unversioned."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_10_0.Volume"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/json-schema/AccountService.v1_16_0.json b/redfish-core/schema/dmtf/json-schema/AccountService.v1_17_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/AccountService.v1_16_0.json
rename to redfish-core/schema/dmtf/json-schema/AccountService.v1_17_0.json
index fbb79f8..7a1b8e1 100644
--- a/redfish-core/schema/dmtf/json-schema/AccountService.v1_16_0.json
+++ b/redfish-core/schema/dmtf/json-schema/AccountService.v1_17_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/AccountService.v1_16_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/AccountService.v1_17_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",
@@ -145,6 +145,14 @@
                     ],
                     "readonly": true
                 },
+                "EnforcePasswordHistoryCount": {
+                    "description": "The number of unique new passwords that need to be associated with a user account before a previous password is accepted when modifying the password.  If `0`, a user does not need to provide a unique new password.",
+                    "longDescription": "This property shall contain the number of unique new passwords that need to be associated with a user account before a previous password is accepted when modifying the password.  If not `0`, services shall reject modification requests of the `Password` property and `ChangePassword` actions that contain a previously used password in the specified count.  If `0`, services shall not require the user to provide a unique new password.  This property does not apply to accounts from external account providers.",
+                    "minimum": 0,
+                    "readonly": false,
+                    "type": "integer",
+                    "versionAdded": "v1_17_0"
+                },
                 "HTTPBasicAuth": {
                     "anyOf": [
                         {
@@ -566,7 +574,7 @@
                 "Certificates": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
                     "description": "The link to a collection of CA certificates used to validate client certificates.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `CertificateCollection` that represents the CA certificates used to validate client certificates during TLS handshaking.  Regardless of the contents of this collection, services may perform additional verification based on other factors, such as the configuration of the `SecurityPolicy` resource.  If the service supports the `RevokedCertificates` or `TrustedCertificates` properties within the `Client` property within TLS property of the `SecurityPolicy` resource, the service shall verify the provided client certificate with the `SecurityPolicy` resource prior to verifying it with this collection.",
+                    "longDescription": "This property shall contain a link to a resource collection of type `CertificateCollection` that represents the CA certificates used to validate client certificates during TLS handshaking.  Regardless of the contents of this collection, services may perform additional verification based on other factors, such as the configuration of the `SecurityPolicy` resource.  If the service supports the `RevokedCertificates` or `TrustedCertificates` properties within the `Server` property within the `TLS` property of the `SecurityPolicy` resource, the service shall verify the provided client certificate with the `SecurityPolicy` resource prior to verifying it with this collection.",
                     "readonly": true,
                     "versionAdded": "v1_12_0"
                 },
@@ -1576,6 +1584,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.3",
-    "title": "#AccountService.v1_16_0.AccountService"
+    "release": "2024.4",
+    "title": "#AccountService.v1_17_0.AccountService"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Cable.v1_2_3.json b/redfish-core/schema/dmtf/json-schema/Cable.v1_2_4.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Cable.v1_2_3.json
rename to redfish-core/schema/dmtf/json-schema/Cable.v1_2_4.json
index 2a80f07..2c5238f 100644
--- a/redfish-core/schema/dmtf/json-schema/Cable.v1_2_3.json
+++ b/redfish-core/schema/dmtf/json-schema/Cable.v1_2_4.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Cable.v1_2_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Cable.v1_2_4.json",
     "$ref": "#/definitions/Cable",
     "$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",
@@ -424,7 +424,7 @@
                 "DownstreamResources": {
                     "description": "An array of links to the downstream resources connected to this cable.",
                     "items": {
-                        "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Resource"
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
                     },
                     "longDescription": "This property shall contain an array of links to resources that represent the physical downstream connections connected to this cable.  Even if the resource is already referenced in another property within `Links`, such as `DownstreamPorts` or `DownstreamChassis`, it shall also be referenced in this property.",
                     "readonly": false,
@@ -465,7 +465,7 @@
                 "UpstreamResources": {
                     "description": "An array of links to the upstream resources connected to this cable.",
                     "items": {
-                        "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Resource"
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
                     },
                     "longDescription": "This property shall contain an array of links to resources that represent the physical upstream connections connected to this cable.  Even if the resource is already referenced in another property within `Links`, such as `UpstreamPorts` or `UpstreamChassis`, it shall also be referenced in this property.",
                     "readonly": false,
@@ -502,5 +502,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2021.4",
-    "title": "#Cable.v1_2_3.Cable"
+    "title": "#Cable.v1_2_4.Cable"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_5.json b/redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_6.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_5.json
rename to redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_6.json
index 765e8aa..329042b 100644
--- a/redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_5.json
+++ b/redfish-core/schema/dmtf/json-schema/CertificateService.v1_0_6.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/CertificateService.v1_0_5.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/CertificateService.v1_0_6.json",
     "$ref": "#/definitions/CertificateService",
     "$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",
@@ -142,7 +142,6 @@
                 "City": {
                     "description": "The city or locality of the organization making the request.",
                     "longDescription": "This parameter shall contain the city or locality of the organization making the request, as defined by the RFC5280 'localityName' attribute.",
-                    "requiredParameter": true,
                     "type": "string"
                 },
                 "CommonName": {
@@ -159,7 +158,6 @@
                 "Country": {
                     "description": "The two-letter country code of the organization making the request.",
                     "longDescription": "This parameter shall contain the two-letter ISO code for the country of the organization making the request, as defined by the RFC5280 'countryName' attribute.",
-                    "requiredParameter": true,
                     "type": "string"
                 },
                 "Email": {
@@ -203,19 +201,16 @@
                 "Organization": {
                     "description": "The name of the organization making the request.",
                     "longDescription": "This parameter shall contain the name of the organization making the request, as defined by the RFC5280 'organizationName' attribute.",
-                    "requiredParameter": true,
                     "type": "string"
                 },
                 "OrganizationalUnit": {
                     "description": "The name of the unit or division of the organization making the request.",
                     "longDescription": "This parameter shall contain the name of the unit or division of the organization making the request, as defined by the RFC5280 'organizationalUnitName' attribute.",
-                    "requiredParameter": true,
                     "type": "string"
                 },
                 "State": {
                     "description": "The state, province, or region of the organization making the request.",
                     "longDescription": "This parameter shall contain the state, province, or region of the organization making the request, as defined by the RFC5280 'stateOrProvinceName' attribute.",
-                    "requiredParameter": true,
                     "type": "string"
                 },
                 "Surname": {
@@ -370,5 +365,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2018.3",
-    "title": "#CertificateService.v1_0_5.CertificateService"
+    "title": "#CertificateService.v1_0_6.CertificateService"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Chassis.v1_25_2.json b/redfish-core/schema/dmtf/json-schema/Chassis.v1_26_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Chassis.v1_25_2.json
rename to redfish-core/schema/dmtf/json-schema/Chassis.v1_26_0.json
index 6c7ca83..9438fcf 100644
--- a/redfish-core/schema/dmtf/json-schema/Chassis.v1_25_2.json
+++ b/redfish-core/schema/dmtf/json-schema/Chassis.v1_26_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Chassis.v1_25_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Chassis.v1_26_0.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",
@@ -264,6 +264,13 @@
                     "readonly": false,
                     "versionDeprecated": "v1_14_0"
                 },
+                "LeakDetectors": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/LeakDetectorCollection.json#/definitions/LeakDetectorCollection",
+                    "description": "The link to the collection of leak detectors located in this chassis.",
+                    "longDescription": "This property shall contain a link to a resource collection of type `LeakDetectorCollection`.",
+                    "readonly": true,
+                    "versionAdded": "v1_26_0"
+                },
                 "Links": {
                     "$ref": "#/definitions/Links",
                     "description": "The links to other resources that are related to this resource.",
@@ -1301,6 +1308,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#Chassis.v1_25_2.Chassis"
+    "release": "2024.4",
+    "title": "#Chassis.v1_26_0.Chassis"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_23_0.json b/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_23_1.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_23_0.json
rename to redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_23_1.json
index 1b5ed97..4518688 100644
--- a/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_23_0.json
+++ b/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_23_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_23_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_23_1.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",
@@ -901,8 +901,8 @@
                     ]
                 },
                 "PowerCycleDelaySeconds": {
-                    "description": "The number of seconds to delay power on after a `Reset` action requesting `PowerCycle`.  Zero seconds indicates no delay.",
-                    "longDescription": "This property shall contain the number of seconds to delay power on after a `Reset` action requesting `PowerCycle`.  The value `0` shall indicate no delay to power on.",
+                    "description": "The number of seconds to delay power on after a `Reset` action requesting `PowerCycle` or `FullPowerCycle`.  Zero seconds indicates no delay.",
+                    "longDescription": "This property shall contain the number of seconds to delay power on after a `Reset` action requesting `PowerCycle` or `FullPowerCycle`.  The value `0` shall indicate no delay to power on.",
                     "readonly": false,
                     "type": [
                         "number",
@@ -935,8 +935,8 @@
                     "versionAdded": "v1_13_0"
                 },
                 "PowerOnDelaySeconds": {
-                    "description": "The number of seconds to delay power on after a power cycle or during a reset.  Zero seconds indicates no delay to power up.",
-                    "longDescription": "This property shall contain the number of seconds to delay power on after a power cycle or during a reset.  The value `0` shall indicate no delay to power on.",
+                    "description": "The number of seconds to delay power on after an externally performed power cycle or during a reset.  Zero seconds indicates no delay to power up.",
+                    "longDescription": "This property shall contain the number of seconds to delay power on after an externally performed power cycle or during a reset.  The value `0` shall indicate no delay to power on.",
                     "readonly": false,
                     "type": [
                         "number",
@@ -2616,5 +2616,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2024.3",
-    "title": "#ComputerSystem.v1_23_0.ComputerSystem"
+    "title": "#ComputerSystem.v1_23_1.ComputerSystem"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Connection.v1_3_2.json b/redfish-core/schema/dmtf/json-schema/Connection.v1_4_0.json
similarity index 86%
rename from redfish-core/schema/dmtf/json-schema/Connection.v1_3_2.json
rename to redfish-core/schema/dmtf/json-schema/Connection.v1_4_0.json
index 6631358..ddf1eaa 100644
--- a/redfish-core/schema/dmtf/json-schema/Connection.v1_3_2.json
+++ b/redfish-core/schema/dmtf/json-schema/Connection.v1_4_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Connection.v1_3_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Connection.v1_4_0.json",
     "$ref": "#/definitions/Connection",
     "$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",
@@ -60,6 +60,12 @@
                 }
             },
             "properties": {
+                "#Connection.AddVolumeInfo": {
+                    "$ref": "#/definitions/AddVolumeInfo"
+                },
+                "#Connection.RemoveVolumeInfo": {
+                    "$ref": "#/definitions/RemoveVolumeInfo"
+                },
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
                     "description": "The available OEM-specific actions for this resource.",
@@ -68,6 +74,59 @@
             },
             "type": "object"
         },
+        "AddVolumeInfo": {
+            "additionalProperties": false,
+            "description": "This action adds a volume to the connection.  Volumes are added to the `VolumeInfo` property.",
+            "longDescription": "This action shall add a volume to the connection.  Services shall add the volume to the `VolumeInfo` property.",
+            "parameters": {
+                "AccessCapabilities": {
+                    "description": "The supported I/O access capabilities to assign to the volume.  Clients are required to provide either `LUN`, `AccessCapabilities`, or both.",
+                    "items": {
+                        "$ref": "#/definitions/AccessCapability"
+                    },
+                    "longDescription": "This parameter shall contain an array of the storage access capabilities to assign to the volume.  Services shall reject requests that do not contain either `LUN` or `AccessCapabilities`.",
+                    "type": "array"
+                },
+                "LUN": {
+                    "description": "The initiator-visible logical unit number (LUN) to assign to the volume.  Clients are required to provide either `LUN`, `AccessCapabilities`, or both.",
+                    "longDescription": "This property shall contain the initiator-visible logical unit number (LUN) to assign to the volume.  Services shall reject requests that do not contain either `LUN` or `AccessCapabilities`.",
+                    "type": "integer"
+                },
+                "Volume": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.json#/definitions/Volume",
+                    "description": "The volume to add.",
+                    "longDescription": "This parameter shall contain a link to a resource of type `Volume` that represents the volume to add.",
+                    "requiredParameter": true
+                }
+            },
+            "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_4_0"
+        },
         "CHAPConnectionKey": {
             "additionalProperties": false,
             "description": "The CHAP-specific permission key information for a connection.",
@@ -645,7 +704,7 @@
                         }
                     ],
                     "description": "The specified memory region.",
-                    "longDescription": "This property shall contain a link to a resource of type `MemoryRegion`.  The endpoints referenced by the `InitiatorEndpoints` or `InitiatorEndpointGroups` properties shall be given access to this memory region as described by this object.  If `TargetEndpoints` or `TargetEndpointGroups` is present, the referenced initiator endpoints shall be required to access the referenced memory region through one of the referenced target endpoints.",
+                    "longDescription": "This property shall contain a link to a resource of type `MemoryRegion`.  The endpoints referenced by the `InitiatorEndpoints` or `InitiatorEndpointGroups` properties shall be given access to this memory region as described by this object.  If `TargetEndpoints` or `TargetEndpointGroups` is present, the referenced initiator endpoints shall be required to access the referenced memory region through one of the referenced target endpoints.  For CXL fabrics, memory regions from `Connection` resources are not allowed.",
                     "readonly": false,
                     "versionAdded": "v1_3_0"
                 }
@@ -673,6 +732,51 @@
             "properties": {},
             "type": "object"
         },
+        "RemoveVolumeInfo": {
+            "additionalProperties": false,
+            "description": "This action removes a volume from the connection.  Volumes are removed from the `VolumeInfo` property.",
+            "longDescription": "This action shall remove a volume to the connection.  Services shall remove the volume from the `VolumeInfo` property.",
+            "parameters": {
+                "LUN": {
+                    "description": "The initiator-visible logical unit number (LUN) assigned to the volume to remove.",
+                    "longDescription": "This parameter shall contain the initiator-visible logical unit number (LUN) assigned to this volume to remove.  If this parameter is not provided, the service shall remove all entries associated with volume referenced by the `Volume` parameter.",
+                    "type": "integer"
+                },
+                "Volume": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.json#/definitions/Volume",
+                    "description": "The volume to remove.",
+                    "longDescription": "This parameter shall contain a link to a resource of type `Volume` that represents the volume to remove.",
+                    "requiredParameter": true
+                }
+            },
+            "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_4_0"
+        },
         "VolumeInfo": {
             "additionalProperties": false,
             "description": "The combination of permissions and volume information.",
@@ -743,6 +847,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.2",
-    "title": "#Connection.v1_3_2.Connection"
+    "release": "2024.4",
+    "title": "#Connection.v1_4_0.Connection"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Control.v1_5_2.json b/redfish-core/schema/dmtf/json-schema/Control.v1_6_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Control.v1_5_2.json
rename to redfish-core/schema/dmtf/json-schema/Control.v1_6_0.json
index d5731c3..8e4eeb5 100644
--- a/redfish-core/schema/dmtf/json-schema/Control.v1_5_2.json
+++ b/redfish-core/schema/dmtf/json-schema/Control.v1_6_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Control.v1_5_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Control.v1_6_0.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",
@@ -289,7 +289,7 @@
                     ],
                     "description": "The sensor reading associated with this control.",
                     "excerptCopy": "SensorExcerpt",
-                    "longDescription": "This property shall contain the Sensor excerpt directly associated with this control.  The value of the `DataSourceUri` property shall reference a resource of type `Sensor`.  This property shall not be present if multiple sensors are associated with a single control."
+                    "longDescription": "This property shall contain the `Sensor` excerpt directly associated with this control.  The value of the `DataSourceUri` property shall reference a resource of type `Sensor`.  This property shall not be present if multiple sensors are associated with a single control."
                 },
                 "SetPoint": {
                     "description": "The desired set point of the control.",
@@ -886,15 +886,17 @@
                 "PressurekPa",
                 "Valve",
                 "Percent",
-                "DutyCycle"
+                "DutyCycle",
+                "LiquidFlowLPM"
             ],
             "enumDeprecated": {
-                "Pressure": "This value has been deprecated in favor of `PressurekPa` for units consistency with the equivalent Sensor resource ReadingType value."
+                "Pressure": "This value has been deprecated in favor of `PressurekPa` for units consistency with the equivalent `Sensor` resource `ReadingType` value."
             },
             "enumDescriptions": {
                 "DutyCycle": "Duty cycle (%) control.",
                 "Frequency": "Frequency (Hz) control.",
                 "FrequencyMHz": "Frequency (MHz) control.",
+                "LiquidFlowLPM": "Liquid flow (L/min) control.",
                 "Percent": "Percent-based control.",
                 "Power": "Power (W) control or power limit.",
                 "Pressure": "Pressure (kPa) control.",
@@ -906,6 +908,7 @@
                 "DutyCycle": "This value shall indicate a control used to adjust the duty cycle, such as a PWM-based control, in percent units.  The `SetPointUnits` property shall contain `%`.",
                 "Frequency": "This value shall indicate a control used to limit the operating frequency, in hertz units, of a device, either to a single set point or within a range.  The `SetPointUnits` property shall contain `Hz`.",
                 "FrequencyMHz": "This value shall indicate a control used to limit the operating frequency, in megahertz units, of a device, either to a single set point or within a range.  The `SetPointUnits` property shall contain `MHz`.",
+                "LiquidFlowLPM": "This value shall indicate a control used to adjust the volume of liquid per unit of time, in liters per minute units, that flows through a particular junction.  The `SetPointUnits` property shall contain `L/min`.",
                 "Percent": "This value shall indicate a percent-based control, in percent units.  The `SetPointUnits` property shall contain `%`.",
                 "Power": "This value shall indicate a control used to regulate or limit maximum power consumption, in watt units, either to a single set point or within a range.  The `SetPointUnits` property shall contain `W`.",
                 "Pressure": "This value shall indicate a control used to adjust pressure in a system, in kilopascal units.  The `SetPointUnits` property shall contain `kPa`.",
@@ -916,6 +919,7 @@
             "enumVersionAdded": {
                 "DutyCycle": "v1_5_0",
                 "FrequencyMHz": "v1_1_0",
+                "LiquidFlowLPM": "v1_6_0",
                 "Percent": "v1_5_0",
                 "Pressure": "v1_1_0",
                 "PressurekPa": "v1_3_0",
@@ -1011,6 +1015,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#Control.v1_5_2.Control"
+    "release": "2024.4",
+    "title": "#Control.v1_6_0.Control"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_0_2.json b/redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_1_0.json
similarity index 78%
rename from redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_0_2.json
rename to redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_1_0.json
index 20b1213..55f5dcc 100644
--- a/redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_0_2.json
+++ b/redfish-core/schema/dmtf/json-schema/CoolantConnector.v1_1_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/CoolantConnector.v1_0_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/CoolantConnector.v1_1_0.json",
     "$ref": "#/definitions/CoolantConnector",
     "$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",
@@ -104,6 +104,21 @@
                         "null"
                     ]
                 },
+                "DeltaPressureControlkPa": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Control.json#/definitions/ControlSingleLoopExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The desired differential pressure (kPa).",
+                    "excerptCopy": "ControlSingleLoopExcerpt",
+                    "longDescription": "This property shall contain the desired differential pressure, in kilopascal units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `PressurekPa`.  This property shall only be present for secondary coolant connectors.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
                 "DeltaPressurekPa": {
                     "anyOf": [
                         {
@@ -132,6 +147,21 @@
                     "longDescription": "This property shall contain the change in temperature, in degree Celsius units, between the supply connection and the outflow or return connection to the cooling loop.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Temperature`.",
                     "readonly": true
                 },
+                "DeltaTemperatureControlCelsius": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Control.json#/definitions/ControlSingleLoopExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The desired differential temperature (C).",
+                    "excerptCopy": "ControlSingleLoopExcerpt",
+                    "longDescription": "This property shall contain the desired differential temperature, in degree Celsius units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `Temperature`.  This property shall only be present for secondary coolant connectors.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
                 "Description": {
                     "anyOf": [
                         {
@@ -143,6 +173,21 @@
                     ],
                     "readonly": true
                 },
+                "FlowControlLitersPerMinute": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Control.json#/definitions/ControlSingleLoopExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The desired liquid flow rate (L/min).",
+                    "excerptCopy": "ControlSingleLoopExcerpt",
+                    "longDescription": "This property shall contain the desired liquid flow rate, in liters per minute units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `LiquidFlowLPM`.  This property shall only be present for secondary coolant connectors.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
                 "FlowLitersPerMinute": {
                     "anyOf": [
                         {
@@ -245,6 +290,21 @@
                     "longDescription": "This property shall contain the pressure, in kilopascal units, for the outflow or return connection to the cooling loop.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `PressurekPa`.",
                     "readonly": true
                 },
+                "ReturnTemperatureControlCelsius": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Control.json#/definitions/ControlSingleLoopExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The desired return temperature (C).",
+                    "excerptCopy": "ControlSingleLoopExcerpt",
+                    "longDescription": "This property shall contain the desired return temperature, in degree Celsius units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `Temperature`.  This property shall only be present for secondary coolant connectors.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
                 "ReturnTemperatureCelsius": {
                     "anyOf": [
                         {
@@ -291,6 +351,21 @@
                     "excerptCopy": "SensorExcerpt",
                     "longDescription": "This property shall contain the temperature, in degree Celsius units, for the intake or supply connection to the cooling loop.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Temperature`.",
                     "readonly": true
+                },
+                "SupplyTemperatureControlCelsius": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Control.json#/definitions/ControlSingleLoopExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The desired supply temperature (C).",
+                    "excerptCopy": "ControlSingleLoopExcerpt",
+                    "longDescription": "This property shall contain the desired supply temperature, in degree Celsius units, of this coolant connector.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Control` with the `ControlType` property containing the value `Temperature`.  This property shall only be present for secondary coolant connectors.  Services may automatically change other controls if a client attempts to enable this control to prevent conflicts.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
                 }
             },
             "required": [
@@ -407,6 +482,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.1",
-    "title": "#CoolantConnector.v1_0_2.CoolantConnector"
+    "release": "2024.4",
+    "title": "#CoolantConnector.v1_1_0.CoolantConnector"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_1_2.json b/redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_2_0.json
similarity index 86%
rename from redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_1_2.json
rename to redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_2_0.json
index 02f2353..492cb09 100644
--- a/redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_1_2.json
+++ b/redfish-core/schema/dmtf/json-schema/CoolingUnit.v1_2_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/CoolingUnit.v1_1_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/CoolingUnit.v1_2_0.json",
     "$ref": "#/definitions/CoolingUnit",
     "$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",
@@ -23,6 +23,9 @@
                 }
             },
             "properties": {
+                "#CoolingUnit.SetMode": {
+                    "$ref": "#/definitions/SetMode"
+                },
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
                     "description": "The available OEM-specific actions for this resource.",
@@ -168,7 +171,7 @@
                 "LeakDetection": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/LeakDetection.json#/definitions/LeakDetection",
                     "description": "A link to the leak detection components associated with this equipment.",
-                    "longDescription": "This property shall contain a link to a resource of type `LeakDetection` that contains the leak detection component information for this equipment.",
+                    "longDescription": "This property shall contain a link to a resource of type `LeakDetection` that contains the leak detection component information for this equipment.  This link should be used when the leak detection capabilities are tied to a particular cooling unit or system which may span multiple `Chassis` resources.  For equipment represented with a single `Chassis` resource or detection inside a particular `Chassis` resource, populating the `LeakDetection` resource under `ThermalSubsystem` for the relevant `Chassis` is the preferred approach.",
                     "readonly": true
                 },
                 "Links": {
@@ -298,6 +301,21 @@
             ],
             "type": "object"
         },
+        "CoolingUnitMode": {
+            "enum": [
+                "Enabled",
+                "Disabled"
+            ],
+            "enumDescriptions": {
+                "Disabled": "Disable the cooling unit.",
+                "Enabled": "Enable the cooling unit."
+            },
+            "enumLongDescriptions": {
+                "Disabled": "This value shall indicate a request to disable the cooling unit.  When disabled, primary functions of the cooling unit, such as pump activity, are also disabled.  When disabled, the cooling unit may perform administrative functions, such as monitoring sensors, controlling valves, and accepting new firmware.  Upon successful completion, the `State` property within `Status`, shall contain the value `Disabled`.",
+                "Enabled": "This value shall indicate a request to enable the cooling unit.  Upon successful completion, the `State` property within `Status`, shall contain the value `Enabled`."
+            },
+            "type": "string"
+        },
         "Links": {
             "additionalProperties": false,
             "description": "The links to other resources that are related to this resource.",
@@ -375,10 +393,49 @@
             },
             "properties": {},
             "type": "object"
+        },
+        "SetMode": {
+            "additionalProperties": false,
+            "description": "This action sets the operating mode of the cooling unit.",
+            "longDescription": "This action shall set the operating mode of the cooling unit.",
+            "parameters": {
+                "Mode": {
+                    "$ref": "#/definitions/CoolingUnitMode",
+                    "description": "The desired operating mode of the cooling unit.",
+                    "longDescription": "This parameter shall contain the desired operating mode of the cooling unit."
+                }
+            },
+            "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_2_0"
         }
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.2",
-    "title": "#CoolingUnit.v1_1_2.CoolingUnit"
+    "release": "2024.4",
+    "title": "#CoolingUnit.v1_2_0.CoolingUnit"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Drive.v1_20_1.json b/redfish-core/schema/dmtf/json-schema/Drive.v1_21_0.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/Drive.v1_20_1.json
rename to redfish-core/schema/dmtf/json-schema/Drive.v1_21_0.json
index a8c8807..03e4818 100644
--- a/redfish-core/schema/dmtf/json-schema/Drive.v1_20_1.json
+++ b/redfish-core/schema/dmtf/json-schema/Drive.v1_21_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Drive.v1_20_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Drive.v1_21_0.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",
@@ -281,6 +281,16 @@
                     ],
                     "versionAdded": "v1_17_0"
                 },
+                "HardwareVersion": {
+                    "description": "The hardware version of this drive.",
+                    "longDescription": "This property shall contain the hardware version of this drive as determined by the vendor or supplier.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_21_0"
+                },
                 "HotspareReplacementMode": {
                     "anyOf": [
                         {
@@ -517,8 +527,8 @@
                     "versionAdded": "v1_10_0"
                 },
                 "Revision": {
-                    "description": "The revision of this drive.  For SCSI-based drives, this is the version of the drive from the 'Inquiry' command, which can be the firmware or hardware version.  For other types of drives, this is the hardware version.",
-                    "longDescription": "This property shall contain the manufacturer-defined revision for the associated drive.  For SCSI-based drives, this is the version of the drive from the 'Inquiry' command, which can be the firmware or hardware version.  For other types of drives, this is the hardware version.",
+                    "description": "The revision of a SCSI-based drive, as returned from the 'Inquiry' command, which can be the firmware or hardware version.  For other types of drives, the `HardwareVersion` and `FirmwareVersion` properties are recommended in favor of this property.",
+                    "longDescription": "This property shall contain the manufacturer-defined revision for a SCSI-based drive, as returned in the 'Product Revision Level' field from the 'Inquiry' command, which can be the firmware or hardware version.  For other types of drives, this property should not be present and services should support the `HardwareVersion` and `FirmwareVersion` properties in favor of this property.  If this property is present for drives that are not SCSI-based, the value may contain a firmware version, hardware version, or a combination.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1286,6 +1296,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.2",
-    "title": "#Drive.v1_20_1.Drive"
+    "release": "2024.4",
+    "title": "#Drive.v1_21_0.Drive"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_2.json b/redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_3.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_2.json
rename to redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_3.json
index ea65bcc..76457ec 100644
--- a/redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_2.json
+++ b/redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_3.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/EthernetInterface.v1_12_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EthernetInterface.v1_12_3.json",
     "$ref": "#/definitions/EthernetInterface",
     "$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",
@@ -482,7 +482,7 @@
                 },
                 "InterfaceEnabled": {
                     "description": "An indication of whether this interface is enabled.",
-                    "longDescription": "This property shall indicate whether this interface is enabled.",
+                    "longDescription": "This property shall indicate whether this interface is enabled.  If this interface is also a host interface, modifying this property may modify the `InterfaceEnabled` property in the `HostInterface` resource for this interface.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -973,5 +973,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.3",
-    "title": "#EthernetInterface.v1_12_2.EthernetInterface"
+    "title": "#EthernetInterface.v1_12_3.EthernetInterface"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/EventDestination.v1_15_0.json b/redfish-core/schema/dmtf/json-schema/EventDestination.v1_15_1.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/EventDestination.v1_15_0.json
rename to redfish-core/schema/dmtf/json-schema/EventDestination.v1_15_1.json
index d261e7f..8287bd6 100644
--- a/redfish-core/schema/dmtf/json-schema/EventDestination.v1_15_0.json
+++ b/redfish-core/schema/dmtf/json-schema/EventDestination.v1_15_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/EventDestination.v1_15_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EventDestination.v1_15_1.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",
@@ -55,7 +55,7 @@
                 "RetryForever": "This value shall indicate the subscription is not suspended or terminated, and attempts at delivery of future events shall continue regardless of the number of retries.  The interval between retries remains constant and is specified by the `DeliveryRetryIntervalSeconds` property in the event service.",
                 "RetryForeverWithBackoff": "This value shall indicate the subscription is not suspended or terminated, and attempts at delivery of future events shall continue regardless of the number of retries.  Retry attempts are issued over time according to a service-defined backoff algorithm.  The backoff algorithm may insert an increasing amount of delay between retry attempts and may reach a maximum.",
                 "SuspendRetries": "This value shall indicate the subscription is suspended after the maximum number of retries is reached, specified by the `DeliveryRetryAttempts` property in the event service.  The value of the `State` property within `Status` shall contain `Disabled` for a suspended subscription.",
-                "TerminateAfterRetries": "This value shall indicate the subscription is terminated after the maximum number of retries is reached, specified by the `DeliveryRetryAttempts` property in the event service."
+                "TerminateAfterRetries": "This value shall indicate the subscription is terminated after the maximum number of retries is reached, specified by the `DeliveryRetryAttempts` property in the event service.  The service shall delete this resource to terminate the subscription."
             },
             "enumVersionAdded": {
                 "RetryForeverWithBackoff": "v1_10_0"
@@ -961,5 +961,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2024.3",
-    "title": "#EventDestination.v1_15_0.EventDestination"
+    "title": "#EventDestination.v1_15_1.EventDestination"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/EventService.v1_10_2.json b/redfish-core/schema/dmtf/json-schema/EventService.v1_10_3.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/EventService.v1_10_2.json
rename to redfish-core/schema/dmtf/json-schema/EventService.v1_10_3.json
index 862b79a..dbef83f 100644
--- a/redfish-core/schema/dmtf/json-schema/EventService.v1_10_2.json
+++ b/redfish-core/schema/dmtf/json-schema/EventService.v1_10_3.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/EventService.v1_10_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EventService.v1_10_3.json",
     "$ref": "#/definitions/EventService",
     "$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",
@@ -74,8 +74,8 @@
                     "longDescription": "This property shall contain the available actions for this resource."
                 },
                 "DeliveryRetryAttempts": {
-                    "description": "The number of times that the `POST` of an event is retried before the subscription terminates.  This retry occurs at the service level, which means that the HTTP `POST` to the event destination fails with an HTTP `4XX` or `5XX` status code or an HTTP timeout occurs this many times before the event destination subscription terminates.",
-                    "longDescription": "This property shall contain the number of times that the `POST` of an event is retried before the subscription terminates.  This retry occurs at the service level, which means that the HTTP `POST` to the event destination fails with an HTTP `4XX` or `5XX` status code or an HTTP timeout occurs this many times before the event destination subscription terminates.",
+                    "description": "The number of times that the `POST` of an event is retried before the subscription terminates or is suspended.  This retry occurs at the service level, which means that the HTTP `POST` to the event destination fails with an HTTP `4XX` or `5XX` status code or an HTTP timeout occurs this many times before the event destination subscription terminates or is suspended.",
+                    "longDescription": "This property shall contain the number of times that the `POST` of an event is retried before the subscription terminates or is suspended.  This retry occurs at the service level, which means that the HTTP `POST` to the event destination fails with an HTTP `4XX` or `5XX` status code or an HTTP timeout occurs this many times before the event destination subscription terminates or is suspended.  The service shall delete the `EventDestination` resource to terminate the subscription.  The service shall set the value of the `State` property within `Status` of the `EventDestination` resource to `Disabled` for a suspended subscription.",
                     "readonly": false,
                     "type": "integer"
                 },
@@ -667,5 +667,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.1",
-    "title": "#EventService.v1_10_2.EventService"
+    "title": "#EventService.v1_10_3.EventService"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/HostInterface.v1_3_2.json b/redfish-core/schema/dmtf/json-schema/HostInterface.v1_3_3.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/HostInterface.v1_3_2.json
rename to redfish-core/schema/dmtf/json-schema/HostInterface.v1_3_3.json
index 23af94d..6e0c83c 100644
--- a/redfish-core/schema/dmtf/json-schema/HostInterface.v1_3_2.json
+++ b/redfish-core/schema/dmtf/json-schema/HostInterface.v1_3_3.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/HostInterface.v1_3_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/HostInterface.v1_3_3.json",
     "$ref": "#/definitions/HostInterface",
     "$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",
@@ -219,7 +219,7 @@
                 },
                 "InterfaceEnabled": {
                     "description": "An indication of whether this interface is enabled.",
-                    "longDescription": "This property shall indicate whether this interface is enabled.",
+                    "longDescription": "This property shall indicate whether this interface is enabled.  Modifying this property may modify the `InterfaceEnabled` property in the `EthernetInterface` resource for this host interface.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -388,5 +388,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#HostInterface.v1_3_2.HostInterface"
+    "title": "#HostInterface.v1_3_3.HostInterface"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_2_0.json b/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_3_0.json
similarity index 94%
rename from redfish-core/schema/dmtf/json-schema/LeakDetector.v1_2_0.json
rename to redfish-core/schema/dmtf/json-schema/LeakDetector.v1_3_0.json
index beb3851..4092f5d 100644
--- a/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_2_0.json
+++ b/redfish-core/schema/dmtf/json-schema/LeakDetector.v1_3_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/LeakDetector.v1_2_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/LeakDetector.v1_3_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",
@@ -92,6 +92,16 @@
                     "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
                 },
+                "Enabled": {
+                    "description": "Indicates whether the leak detector is enabled and provides a status.",
+                    "longDescription": "This property shall indicate whether the leak detector is enabled and provides a `DetectorState`.  The value `true` shall indicate the leak detector is enabled and returns the `DetectorState` property with a valid value.  The value `false` shall indicate the leak detector is disabled, shall not return the `DetectorState` property, and shall not trigger events, logging, or other functionality.  This property allows a user to disable a faulty leak detector or to otherwise remove it from use.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_3_0"
+                },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
@@ -406,6 +416,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.3",
-    "title": "#LeakDetector.v1_2_0.LeakDetector"
+    "release": "2024.4",
+    "title": "#LeakDetector.v1_3_0.LeakDetector"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/LeakDetectorCollection.json b/redfish-core/schema/dmtf/json-schema/LeakDetectorCollection.json
index f01829a..d9b636b 100644
--- a/redfish-core/schema/dmtf/json-schema/LeakDetectorCollection.json
+++ b/redfish-core/schema/dmtf/json-schema/LeakDetectorCollection.json
@@ -90,6 +90,13 @@
             "insertable": false,
             "updatable": false,
             "uris": [
+                "/redfish/v1/Chassis/{ChassisId}/LeakDetectors",
+                "/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/LeakDetection/LeakDetectors",
+                "/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/LeakDetection/LeakDetectors",
+                "/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/LeakDetection/LeakDetectors",
+                "/redfish/v1/ThermalEquipment/HeatExchangers/{CoolingUnitId}/LeakDetection/LeakDetectors/"
+            ],
+            "urisDeprecated": [
                 "/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/LeakDetection/LeakDetectors",
                 "/redfish/v1/ThermalEquipment/CDUs/{CoolingUnitId}/LeakDetection/LeakDetectors",
                 "/redfish/v1/ThermalEquipment/ImmersionUnits/{CoolingUnitId}/LeakDetection/LeakDetectors",
diff --git a/redfish-core/schema/dmtf/json-schema/Manager.v1_19_2.json b/redfish-core/schema/dmtf/json-schema/Manager.v1_20_0.json
similarity index 96%
rename from redfish-core/schema/dmtf/json-schema/Manager.v1_19_2.json
rename to redfish-core/schema/dmtf/json-schema/Manager.v1_20_0.json
index f75c896..39e9daa0e 100644
--- a/redfish-core/schema/dmtf/json-schema/Manager.v1_19_2.json
+++ b/redfish-core/schema/dmtf/json-schema/Manager.v1_20_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Manager.v1_19_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Manager.v1_20_0.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",
@@ -102,6 +102,23 @@
             },
             "type": "object"
         },
+        "DateTimeSource": {
+            "enum": [
+                "RTC",
+                "Firmware",
+                "Host",
+                "NTP",
+                "PTP"
+            ],
+            "enumDescriptions": {
+                "Firmware": "The date and time is set and held by firmware.",
+                "Host": "The date and time is retrieved from the host.",
+                "NTP": "The date and time source is a Network Time Protocol (NTP) server.",
+                "PTP": "The date and time source is a Precision Time Protocol (PTP) server.",
+                "RTC": "The date and time is retrieved from the manager's real time clock (RTC)."
+            },
+            "type": "string"
+        },
         "DaylightSavingTime": {
             "additionalProperties": false,
             "description": "The daylight saving time settings for a manager.",
@@ -460,6 +477,20 @@
                         "null"
                     ]
                 },
+                "DateTimeSource": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/DateTimeSource"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The source of the date and time of this manager, such as NTP, RTC, or firmware.",
+                    "longDescription": "This property shall contain the source of the `DateTime` property of this manager.  The service shall update this property if the source changes internally, for example if an NTP server is unavailable and the source falls back to the time stored by the RTC.",
+                    "readonly": false,
+                    "versionAdded": "v1_20_0"
+                },
                 "DaylightSavingTime": {
                     "$ref": "#/definitions/DaylightSavingTime",
                     "description": "The daylight saving time settings for this manager.",
@@ -931,7 +962,7 @@
         "Reset": {
             "additionalProperties": false,
             "description": "The reset action resets/reboots the manager.",
-            "longDescription": "This action shall reset the manager.",
+            "longDescription": "This action shall reset the manager.  If this manager provides the Redfish service, the service shall send the action response before resetting to prevent client timeouts.",
             "parameters": {
                 "ResetType": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/ResetType",
@@ -1081,6 +1112,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.3",
-    "title": "#Manager.v1_19_2.Manager"
+    "release": "2024.4",
+    "title": "#Manager.v1_20_0.Manager"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_16_0.json b/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_17_0.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_16_0.json
rename to redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_17_0.json
index 441dfea..f491662 100644
--- a/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_16_0.json
+++ b/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_17_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_16_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_17_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",
@@ -1090,9 +1090,11 @@
                 "OEM",
                 "OCP3Small",
                 "OCP3Large",
-                "U2"
+                "U2",
+                "EDSFF"
             ],
             "enumDescriptions": {
+                "EDSFF": "EDSFF slot.",
                 "FullLength": "Full-Length PCIe slot.",
                 "HalfLength": "Half-Length PCIe slot.",
                 "LowProfile": "Low-Profile or Slim PCIe slot.",
@@ -1103,11 +1105,14 @@
                 "OEM": "An OEM-specific slot.",
                 "U2": "U.2 / SFF-8639 slot or bay."
             },
+            "enumVersionAdded": {
+                "EDSFF": "v1_17_0"
+            },
             "type": "string"
         }
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.3",
-    "title": "#PCIeDevice.v1_16_0.PCIeDevice"
+    "release": "2024.4",
+    "title": "#PCIeDevice.v1_17_0.PCIeDevice"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Port.v1_14_0.json b/redfish-core/schema/dmtf/json-schema/Port.v1_15_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Port.v1_14_0.json
rename to redfish-core/schema/dmtf/json-schema/Port.v1_15_0.json
index e3ff58e..f2c44be 100644
--- a/redfish-core/schema/dmtf/json-schema/Port.v1_14_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Port.v1_15_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Port.v1_14_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Port.v1_15_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",
@@ -749,6 +749,24 @@
             },
             "type": "object"
         },
+        "HostDeviceType": {
+            "enum": [
+                "None",
+                "System",
+                "Manager"
+            ],
+            "enumDescriptions": {
+                "Manager": "The port is connected to a manager device.",
+                "None": "The port is not connected to any host device.",
+                "System": "The port is connected to a computer system device."
+            },
+            "enumLongDescriptions": {
+                "Manager": "This value shall indicate the port is connected to a manager device.",
+                "None": "This value shall indicate the port is not connected to any host device.",
+                "System": "This value shall indicate the port is connected to a computer system device."
+            },
+            "type": "string"
+        },
         "IEEE802IdSubtype": {
             "enum": [
                 "ChassisComp",
@@ -1602,6 +1620,20 @@
                     "longDescription": "This property shall contain Gen-Z specific properties for this interface.",
                     "versionAdded": "v1_2_0"
                 },
+                "HostDevice": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/HostDeviceType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The current host device for this port.",
+                    "longDescription": "This property shall contain the current host device of port.",
+                    "readonly": false,
+                    "versionAdded": "v1_15_0"
+                },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
@@ -1739,15 +1771,13 @@
                     "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
                 "PortId": {
-                    "deprecated": "This property has been deprecated in favor of `Location` and `ServiceLabel`.",
-                    "description": "The label of this port on the physical package for this port.",
-                    "longDescription": "This property shall contain the name of the port as indicated on the device containing the port.",
+                    "description": "The hardware-defined identifier of this port.",
+                    "longDescription": "This property shall contain the hardware-defined identifier of this port.  The human-readable name of this port is described in the `ServiceLabel` property within `Location` for this port.",
                     "readonly": true,
                     "type": [
                         "string",
                         "null"
-                    ],
-                    "versionDeprecated": "v1_12_0"
+                    ]
                 },
                 "PortMedium": {
                     "anyOf": [
@@ -2242,6 +2272,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.3",
-    "title": "#Port.v1_14_0.Port"
+    "release": "2024.4",
+    "title": "#Port.v1_15_0.Port"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/PowerSubsystem.v1_1_2.json b/redfish-core/schema/dmtf/json-schema/PowerSubsystem.v1_1_3.json
similarity index 95%
rename from redfish-core/schema/dmtf/json-schema/PowerSubsystem.v1_1_2.json
rename to redfish-core/schema/dmtf/json-schema/PowerSubsystem.v1_1_3.json
index aba9de5..0a642e7 100644
--- a/redfish-core/schema/dmtf/json-schema/PowerSubsystem.v1_1_2.json
+++ b/redfish-core/schema/dmtf/json-schema/PowerSubsystem.v1_1_3.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/PowerSubsystem.v1_1_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/PowerSubsystem.v1_1_3.json",
     "$ref": "#/definitions/PowerSubsystem",
     "$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",
@@ -134,8 +134,8 @@
                 },
                 "Allocation": {
                     "$ref": "#/definitions/PowerAllocation",
-                    "description": "Power allocation for this subsystem.",
-                    "longDescription": "This property shall contain the set of properties describing the allocation of power for this subsystem."
+                    "description": "Power allocation for this subsystem when it represents a subset of the power infrastructure for the chassis or its upstream chassis, such as a chassis containing multiple server blades.",
+                    "longDescription": "This property shall contain the set of properties describing the allocation of power for this subsystem as part of the power infrastructure for the chassis or an upstream chassis.  This property should not be present in resources that are not part of a shared power infrastructure."
                 },
                 "Batteries": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/BatteryCollection.json#/definitions/BatteryCollection",
@@ -211,5 +211,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2021.2",
-    "title": "#PowerSubsystem.v1_1_2.PowerSubsystem"
+    "title": "#PowerSubsystem.v1_1_3.PowerSubsystem"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Pump.v1_1_0.json b/redfish-core/schema/dmtf/json-schema/Pump.v1_2_0.json
similarity index 81%
rename from redfish-core/schema/dmtf/json-schema/Pump.v1_1_0.json
rename to redfish-core/schema/dmtf/json-schema/Pump.v1_2_0.json
index d34fb74..8018c70 100644
--- a/redfish-core/schema/dmtf/json-schema/Pump.v1_1_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Pump.v1_2_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Pump.v1_1_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Pump.v1_2_0.json",
     "$ref": "#/definitions/Pump",
     "$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",
@@ -23,6 +23,9 @@
                 }
             },
             "properties": {
+                "#Pump.SetMode": {
+                    "$ref": "#/definitions/SetMode"
+                },
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
                     "description": "The available OEM-specific actions for this resource.",
@@ -130,6 +133,21 @@
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
                 },
+                "InletPressurekPa": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The inlet pressure (kPa).",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the pressure, in kilopascal units, for the inlet to this pump.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `PressurekPa`.",
+                    "readonly": true,
+                    "versionAdded": "v1_2_0"
+                },
                 "Location": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Location",
                     "description": "The location of the pump.",
@@ -294,6 +312,21 @@
             ],
             "type": "object"
         },
+        "PumpMode": {
+            "enum": [
+                "Enabled",
+                "Disabled"
+            ],
+            "enumDescriptions": {
+                "Disabled": "Disable the pump.",
+                "Enabled": "Enable the pump."
+            },
+            "enumLongDescriptions": {
+                "Disabled": "This value shall indicate a request to disable the pump.  Upon successful completion, the `State` property within `Status`, shall contain the value `Disabled`.",
+                "Enabled": "This value shall indicate a request to enable the pump.  Upon successful completion, the `State` property within `Status`, shall contain the value `Enabled`."
+            },
+            "type": "string"
+        },
         "PumpType": {
             "enum": [
                 "Liquid",
@@ -304,10 +337,49 @@
                 "Liquid": "A water or liquid pump."
             },
             "type": "string"
+        },
+        "SetMode": {
+            "additionalProperties": false,
+            "description": "This action sets the operating mode of the pump.",
+            "longDescription": "This action shall set the operating mode of the pump.",
+            "parameters": {
+                "Mode": {
+                    "$ref": "#/definitions/PumpMode",
+                    "description": "The desired operating mode of the pump.",
+                    "longDescription": "This parameter shall contain the desired operating mode of the pump."
+                }
+            },
+            "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_2_0"
         }
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#Pump.v1_1_0.Pump"
+    "release": "2024.4",
+    "title": "#Pump.v1_2_0.Pump"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Redundancy.v1_4_2.json b/redfish-core/schema/dmtf/json-schema/Redundancy.v1_5_0.json
similarity index 95%
rename from redfish-core/schema/dmtf/json-schema/Redundancy.v1_4_2.json
rename to redfish-core/schema/dmtf/json-schema/Redundancy.v1_5_0.json
index e8608e7..6410b83 100644
--- a/redfish-core/schema/dmtf/json-schema/Redundancy.v1_4_2.json
+++ b/redfish-core/schema/dmtf/json-schema/Redundancy.v1_5_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Redundancy.v1_4_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Redundancy.v1_5_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": {
@@ -227,6 +227,13 @@
                 }
             },
             "properties": {
+                "GroupName": {
+                    "description": "The name of the redundant group.",
+                    "longDescription": "This property shall contain the name of the redundant group used to identify the particular group of redundant resources.  The value shall conform with the 'Name' clause of the Redfish Specification.",
+                    "readonly": true,
+                    "type": "string",
+                    "versionAdded": "v1_5_0"
+                },
                 "MaxSupportedInGroup": {
                     "description": "The maximum number of devices supported in this redundancy group.",
                     "longDescription": "This property shall contain the maximum number of devices allowed in the redundancy group.",
@@ -292,6 +299,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2020.4",
-    "title": "#Redundancy.v1_4_2"
+    "release": "2024.4",
+    "title": "#Redundancy.v1_5_0"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Resource.v1_20_0.json b/redfish-core/schema/dmtf/json-schema/Resource.v1_21_0.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/Resource.v1_20_0.json
rename to redfish-core/schema/dmtf/json-schema/Resource.v1_21_0.json
index 7cbdc9a..9614ce4 100644
--- a/redfish-core/schema/dmtf/json-schema/Resource.v1_20_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Resource.v1_21_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_20_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_21_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.3",
-    "title": "#Resource.v1_20_0"
+    "release": "2024.4",
+    "title": "#Resource.v1_21_0"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Role.v1_3_2.json b/redfish-core/schema/dmtf/json-schema/Role.v1_3_3.json
similarity index 96%
rename from redfish-core/schema/dmtf/json-schema/Role.v1_3_2.json
rename to redfish-core/schema/dmtf/json-schema/Role.v1_3_3.json
index f86fe8d..03c7e0a 100644
--- a/redfish-core/schema/dmtf/json-schema/Role.v1_3_2.json
+++ b/redfish-core/schema/dmtf/json-schema/Role.v1_3_3.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Role.v1_3_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Role.v1_3_3.json",
     "$ref": "#/definitions/Role",
     "$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",
@@ -123,7 +123,7 @@
                 },
                 "IsPredefined": {
                     "description": "An indication of whether the role is predefined by Redfish or an OEM rather than a client-defined role.",
-                    "longDescription": "This property shall indicate whether the role is predefined by Redfish or an OEM as contrasted with a client-defined role.",
+                    "longDescription": "This property shall indicate whether the role is predefined by Redfish or an OEM as contrasted with a client-defined role.  If this property is not present, the value should be assumed to be `false`.",
                     "readonly": true,
                     "type": "boolean"
                 },
@@ -164,7 +164,8 @@
                 "@odata.id",
                 "@odata.type",
                 "Id",
-                "Name"
+                "Name",
+                "RoleId"
             ],
             "requiredOnCreate": [
                 "RoleId"
@@ -175,5 +176,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2020.4",
-    "title": "#Role.v1_3_2.Role"
+    "title": "#Role.v1_3_3.Role"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/SecurityPolicy.v1_0_2.json b/redfish-core/schema/dmtf/json-schema/SecurityPolicy.v1_0_3.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/SecurityPolicy.v1_0_2.json
rename to redfish-core/schema/dmtf/json-schema/SecurityPolicy.v1_0_3.json
index 3786a9a..0773243 100644
--- a/redfish-core/schema/dmtf/json-schema/SecurityPolicy.v1_0_2.json
+++ b/redfish-core/schema/dmtf/json-schema/SecurityPolicy.v1_0_3.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/SecurityPolicy.v1_0_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/SecurityPolicy.v1_0_3.json",
     "$ref": "#/definitions/SecurityPolicy",
     "$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",
@@ -387,12 +387,12 @@
             "properties": {
                 "Client": {
                     "$ref": "#/definitions/TLSPolicy",
-                    "description": "The TLS policy.",
+                    "description": "The TLS policy where the manager acts as a TLS client for communication with servers.",
                     "longDescription": "This property shall contain the policy requirements and usage for TLS connections where the manager acts as a TLS client."
                 },
                 "Server": {
                     "$ref": "#/definitions/TLSPolicy",
-                    "description": "The TLS policy.",
+                    "description": "The TLS policy where the manager acts as a TLS server for communication with clients.",
                     "longDescription": "This property shall contain the policy requirements and usage for TLS connections where the manager acts as a TLS server."
                 }
             },
@@ -495,5 +495,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2022.2",
-    "title": "#SecurityPolicy.v1_0_2.SecurityPolicy"
+    "title": "#SecurityPolicy.v1_0_3.SecurityPolicy"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Session.v1_7_2.json b/redfish-core/schema/dmtf/json-schema/Session.v1_8_0.json
similarity index 95%
rename from redfish-core/schema/dmtf/json-schema/Session.v1_7_2.json
rename to redfish-core/schema/dmtf/json-schema/Session.v1_8_0.json
index 31c8950..9d86ab8 100644
--- a/redfish-core/schema/dmtf/json-schema/Session.v1_7_2.json
+++ b/redfish-core/schema/dmtf/json-schema/Session.v1_8_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Session.v1_7_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Session.v1_8_0.json",
     "$ref": "#/definitions/Session",
     "$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",
@@ -166,6 +166,14 @@
                     ],
                     "readonly": true
                 },
+                "ExpirationTime": {
+                    "description": "The date and time when the session expires regardless of session activity.",
+                    "format": "date-time",
+                    "longDescription": "This property shall contain the date and time when the session expires regardless of session activity.  The service shall delete this resource when the expiration time is reached.  If this property is not present, the session does not expire based on an absolute time.",
+                    "readonly": true,
+                    "type": "string",
+                    "versionAdded": "v1_8_0"
+                },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
@@ -307,6 +315,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2023.2",
-    "title": "#Session.v1_7_2.Session"
+    "release": "2024.4",
+    "title": "#Session.v1_8_0.Session"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/SessionService.v1_1_9.json b/redfish-core/schema/dmtf/json-schema/SessionService.v1_2_0.json
similarity index 84%
rename from redfish-core/schema/dmtf/json-schema/SessionService.v1_1_9.json
rename to redfish-core/schema/dmtf/json-schema/SessionService.v1_2_0.json
index d965e61..4fd6278 100644
--- a/redfish-core/schema/dmtf/json-schema/SessionService.v1_1_9.json
+++ b/redfish-core/schema/dmtf/json-schema/SessionService.v1_2_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/SessionService.v1_1_9.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/SessionService.v1_2_0.json",
     "$ref": "#/definitions/SessionService",
     "$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",
@@ -84,6 +84,23 @@
                 "@odata.type": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
                 },
+                "AbsoluteSessionTimeout": {
+                    "description": "The maximum number of seconds that a session is open before the service closes the session regardless of activity.",
+                    "longDescription": "This property shall contain the maximum number of seconds that a session is open before the service closes the session regardless of activity.",
+                    "maximum": 86400,
+                    "minimum": 30,
+                    "readonly": false,
+                    "type": "integer",
+                    "units": "s",
+                    "versionAdded": "v1_2_0"
+                },
+                "AbsoluteSessionTimeoutEnabled": {
+                    "description": "An indication of whether an absolute session timeout is applied to sessions.",
+                    "longDescription": "This property shall indicate whether an absolute session timeout is applied to sessions.  If `true`, the service shall close sessions that are open for the number of seconds specified by the `AbsoluteSessionTimeout` property regardless of session activity.  If `false` or if this property is not present, the service shall not apply an absolute session timeout.",
+                    "readonly": false,
+                    "type": "boolean",
+                    "versionAdded": "v1_2_0"
+                },
                 "Actions": {
                     "$ref": "#/definitions/Actions",
                     "description": "The available actions for this resource.",
@@ -155,6 +172,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2016.2",
-    "title": "#SessionService.v1_1_9.SessionService"
+    "release": "2024.4",
+    "title": "#SessionService.v1_2_0.SessionService"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Storage.v1_17_1.json b/redfish-core/schema/dmtf/json-schema/Storage.v1_18_0.json
similarity index 94%
rename from redfish-core/schema/dmtf/json-schema/Storage.v1_17_1.json
rename to redfish-core/schema/dmtf/json-schema/Storage.v1_18_0.json
index a512bba..959e6f4 100644
--- a/redfish-core/schema/dmtf/json-schema/Storage.v1_17_1.json
+++ b/redfish-core/schema/dmtf/json-schema/Storage.v1_18_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_17_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_18_0.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",
@@ -202,6 +202,32 @@
                 }
             },
             "properties": {
+                "BlockSecurityIDUnsupportedDrives": {
+                    "description": "The set of drives in this storage subsystem that do not support blocking of TCG-defined security ID (SID).",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Drive.json#/definitions/Drive"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `Drive` that represent the drives in this storage subsystem that do not support the TCG-defined 'Block SID' command.  This property should only be present if at least one drive does not support the TCG-defined 'Block SID' command.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_18_0"
+                },
+                "BlockSecurityIDUnsupportedDrives@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "BlockSecurityIDUpdateUnsuccessfulDrives": {
+                    "description": "The set of drives in this storage subsystem for which the most recent attempt to block TCG-defined security ID (SID) failed.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Drive.json#/definitions/Drive"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type `Drive` that represent the drives in this storage subsystem for which the most recent attempt to block TCG-defined security ID (SID) with the TCG-defined 'Block SID' command failed.  This property should only be present if the most recent attempt to block TCG-defined security ID (SID) with the TCG-defined 'Block SID' command failed for at least one drive.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_18_0"
+                },
+                "BlockSecurityIDUpdateUnsuccessfulDrives@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
                 "Enclosures": {
                     "description": "An array of links to the chassis to which this storage subsystem is attached.",
                     "items": {
@@ -729,6 +755,16 @@
                     "readonly": false,
                     "versionAdded": "v1_15_0"
                 },
+                "BlockSecurityIDPolicy": {
+                    "description": "Indicates if the storage controller sends a command to block establishment of a TCG-defined security ID (SID) during each drive boot sequence for drives that support it.",
+                    "longDescription": "This property shall indicate if the storage controller sends the TCG-defined 'Block SID' command to block establishment of a TCG-defined security ID (SID) during each drive boot sequence for drives that support it.  The value `true` shall indicate the TCG-defined 'Block SID' command is sent to supporting drives during each drive boot sequence.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_18_0"
+                },
                 "ConfigurationLock": {
                     "anyOf": [
                         {
@@ -857,6 +893,20 @@
                     ],
                     "versionAdded": "v1_14_0"
                 },
+                "Metrics": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/StorageMetrics.json#/definitions/StorageMetrics"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The link to the metrics associated with this storage subsystem.",
+                    "longDescription": "This property shall contain a link to a resource of type `StorageMetrics` that represents the metrics associated with this storage subsystem.",
+                    "readonly": true,
+                    "versionAdded": "v1_18_0"
+                },
                 "NVMeSubsystemProperties": {
                     "anyOf": [
                         {
@@ -1322,6 +1372,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.2",
-    "title": "#Storage.v1_17_1.Storage"
+    "release": "2024.4",
+    "title": "#Storage.v1_18_0.Storage"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/StorageController.v1_8_0.json b/redfish-core/schema/dmtf/json-schema/StorageController.v1_9_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/StorageController.v1_8_0.json
rename to redfish-core/schema/dmtf/json-schema/StorageController.v1_9_0.json
index f816671..588fe94 100644
--- a/redfish-core/schema/dmtf/json-schema/StorageController.v1_8_0.json
+++ b/redfish-core/schema/dmtf/json-schema/StorageController.v1_9_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/StorageController.v1_8_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/StorageController.v1_9_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,16 @@
                     "longDescription": "This property shall contain the type of NVMe controller.",
                     "readonly": true
                 },
+                "DiscoveryTransportServiceId": {
+                    "description": "The NVMe discovery transport service identifier for the discovery controller.",
+                    "longDescription": "This property shall contain the NVMe discovery transport service identifier for the discovery controller.  This property shall only be present if `ControllerType` contains `Discovery`.  For NVMe/TCP, the default value should be `8009`.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_9_0"
+                },
                 "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.",
@@ -1197,6 +1207,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.3",
-    "title": "#StorageController.v1_8_0.StorageController"
+    "release": "2024.4",
+    "title": "#StorageController.v1_9_0.StorageController"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/SessionService.v1_1_9.json b/redfish-core/schema/dmtf/json-schema/StorageMetrics.v1_0_0.json
similarity index 65%
copy from redfish-core/schema/dmtf/json-schema/SessionService.v1_1_9.json
copy to redfish-core/schema/dmtf/json-schema/StorageMetrics.v1_0_0.json
index d965e61..c1c0bc2 100644
--- a/redfish-core/schema/dmtf/json-schema/SessionService.v1_1_9.json
+++ b/redfish-core/schema/dmtf/json-schema/StorageMetrics.v1_0_0.json
@@ -1,6 +1,6 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/SessionService.v1_1_9.json",
-    "$ref": "#/definitions/SessionService",
+    "$id": "http://redfish.dmtf.org/schemas/v1/StorageMetrics.v1_0_0.json",
+    "$ref": "#/definitions/StorageMetrics",
     "$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": {
@@ -26,8 +26,7 @@
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
                     "description": "The available OEM-specific actions for this resource.",
-                    "longDescription": "This property shall contain the available OEM-specific actions for this resource.",
-                    "versionAdded": "v1_1_0"
+                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
                 }
             },
             "type": "object"
@@ -53,10 +52,10 @@
             "properties": {},
             "type": "object"
         },
-        "SessionService": {
+        "StorageMetrics": {
             "additionalProperties": false,
-            "description": "The `SessionService` schema describes the session service and its properties, with links to the actual list of sessions.",
-            "longDescription": "This resource contains the session service properties for a Redfish implementation.",
+            "description": "The usage and health statistics for a storage subsystem.",
+            "longDescription": "The `StorageMetrics` schema shall contain the usage and health statistics for a storage subsystem in a Redfish implementation.",
             "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.",
@@ -87,8 +86,27 @@
                 "Actions": {
                     "$ref": "#/definitions/Actions",
                     "description": "The available actions for this resource.",
-                    "longDescription": "This property shall contain the available actions for this resource.",
-                    "versionAdded": "v1_1_0"
+                    "longDescription": "This property shall contain the available actions for this resource."
+                },
+                "CompressionSavingsBytes": {
+                    "description": "Current compression savings on the storage system in bytes.",
+                    "longDescription": "The value shall represent the current compression savings on the storage system in bytes.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "units": "By"
+                },
+                "DeduplicationSavingsBytes": {
+                    "description": "Current deduplication savings on the storage system in bytes.",
+                    "longDescription": "The value shall represent the current deduplication savings on the storage system in bytes.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "units": "By"
                 },
                 "Description": {
                     "anyOf": [
@@ -101,6 +119,11 @@
                     ],
                     "readonly": true
                 },
+                "IOStatistics": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/IOStatistics.json#/definitions/IOStatistics",
+                    "description": "Statistics for this storage system.",
+                    "longDescription": "The value shall contain the I/O statistics for this storage system."
+                },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
@@ -114,34 +137,24 @@
                     "description": "The OEM extension property.",
                     "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
-                "ServiceEnabled": {
-                    "description": "An indication of whether this service is enabled.  If `true`, this service is enabled.  If `false`, it is disabled, and new sessions cannot be created, old sessions cannot be deleted, and established sessions can continue operating.",
-                    "longDescription": "This property shall indicate whether this service is enabled.  If `true`, this service is enabled.  If `false`, it is disabled, and new sessions shall not be created, old sessions shall not be deleted, and established sessions can continue operating.",
-                    "readonly": false,
+                "StateChangeCount": {
+                    "description": "The number of state changes for this storage subsystem.",
+                    "longDescription": "This property shall contain the number of times the `State` property within the `Status` property of the parent `Storage` resource changed.",
+                    "readonly": true,
                     "type": [
-                        "boolean",
+                        "number",
                         "null"
                     ]
                 },
-                "SessionTimeout": {
-                    "description": "The number of seconds of inactivity that a session can have before the session service closes the session due to inactivity.",
-                    "longDescription": "This property shall contain the threshold of time in seconds between requests on a specific session at which point the session service shall close the session due to inactivity.  The session service shall support any value between the schema-specified minimum and maximum terms.",
-                    "maximum": 86400,
-                    "minimum": 30,
-                    "readonly": false,
-                    "type": "integer",
-                    "units": "s"
-                },
-                "Sessions": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/SessionCollection.json#/definitions/SessionCollection",
-                    "description": "The link to a collection of sessions.",
-                    "longDescription": "This property shall contain a link to a resource collection of type `SessionCollection`.",
-                    "readonly": true
-                },
-                "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."
+                "ThinProvisioningSavingsBytes": {
+                    "description": "Current thin provisioning savings on the storage system in bytes.",
+                    "longDescription": "The value shall represent the current thin provisioning savings on the storage system in bytes.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "units": "By"
                 }
             },
             "required": [
@@ -155,6 +168,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2016.2",
-    "title": "#SessionService.v1_1_9.SessionService"
+    "release": "2024.4",
+    "title": "#StorageMetrics.v1_0_0.StorageMetrics"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_2.json b/redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_3.json
similarity index 95%
rename from redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_2.json
rename to redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_3.json
index 4fe9fd2..9458771 100644
--- a/redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_2.json
+++ b/redfish-core/schema/dmtf/json-schema/ThermalSubsystem.v1_3_3.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ThermalSubsystem.v1_3_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ThermalSubsystem.v1_3_3.json",
     "$ref": "#/definitions/ThermalSubsystem",
     "$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",
@@ -143,7 +143,7 @@
                 "LeakDetection": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/LeakDetection.json#/definitions/LeakDetection",
                     "description": "The link to the leak detection system within this chassis.",
-                    "longDescription": "This property shall contain a link to a resource of type `LeakDetection`.",
+                    "longDescription": "This property shall contain a link to a resource of type `LeakDetection`.  This link should be used when the leak detection capabilities are tied to, or are internal to, a particular `Chassis`.  For detection capabilties that are tied to a `CoolingUnit` resource, which may span multiple `Chassis` resources, populating the `LeakDetection` resource under `CoolingUnit` for the relevant equipment is the preferred approach.",
                     "readonly": true,
                     "versionAdded": "v1_3_0"
                 },
@@ -187,5 +187,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.2",
-    "title": "#ThermalSubsystem.v1_3_2.ThermalSubsystem"
+    "title": "#ThermalSubsystem.v1_3_3.ThermalSubsystem"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/UpdateService.v1_14_1.json b/redfish-core/schema/dmtf/json-schema/UpdateService.v1_15_0.json
similarity index 96%
rename from redfish-core/schema/dmtf/json-schema/UpdateService.v1_14_1.json
rename to redfish-core/schema/dmtf/json-schema/UpdateService.v1_15_0.json
index 69aa80a..9324c4d 100644
--- a/redfish-core/schema/dmtf/json-schema/UpdateService.v1_14_1.json
+++ b/redfish-core/schema/dmtf/json-schema/UpdateService.v1_15_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/UpdateService.v1_14_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/UpdateService.v1_15_0.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",
@@ -539,20 +539,25 @@
                     "readonly": true
                 },
                 "HttpPushUri": {
+                    "deprecated": "This property has been deprecated in favor of the `MultipartHttpPushUri` property.",
                     "description": "The URI used to perform an HTTP or HTTPS push update to the update service.  The format of the message is vendor-specific.",
                     "format": "uri-reference",
                     "longDescription": "This property shall contain a URI at which the update service supports an HTTP or HTTPS `POST` of a software image for the purpose of installing software contained within the image.  Access to this URI shall require the same privilege as access to the update service.  If the service requires the `Content-Length` header for `POST` requests to this URI, the service should return HTTP `411 Length Required` status code if the client does not include this header in the `POST` request.  The value of this property should not contain a URI of a Redfish resource.  See the 'Redfish-defined URIs and relative reference rules' clause in the Redfish Specification.",
                     "readonly": true,
                     "type": "string",
-                    "versionAdded": "v1_1_0"
+                    "versionAdded": "v1_1_0",
+                    "versionDeprecated": "v1_15_0"
                 },
                 "HttpPushUriOptions": {
                     "$ref": "#/definitions/HttpPushUriOptions",
+                    "deprecated": "This property has been deprecated in favor of the update parameters used with `MultipartHttpPushUri`-provided software updates.",
                     "description": "The options for `HttpPushUri`-provided software updates.",
                     "longDescription": "This property shall contain options and requirements of the service for `HttpPushUri`-provided software updates.",
-                    "versionAdded": "v1_4_0"
+                    "versionAdded": "v1_4_0",
+                    "versionDeprecated": "v1_15_0"
                 },
                 "HttpPushUriOptionsBusy": {
+                    "deprecated": "This property has been deprecated in favor of `MultipartHttpPushUri`-provided software updates.",
                     "description": "An indication of whether a client has reserved the `HttpPushUriOptions` properties for software updates.",
                     "longDescription": "This property shall indicate whether a client uses the `HttpPushUriOptions` properties for software updates.  When a client uses any `HttpPushUriOptions` properties for software updates, it should set this property to `true`.  When a client no longer uses `HttpPushUriOptions` properties for software updates, it should set this property to `false`.  This property can provide multiple clients a way to negotiate ownership of `HttpPushUriOptions` properties.  Clients can use this property to determine whether another client uses `HttpPushUriOptions` properties for software updates.  This property has no functional requirements for the service.",
                     "readonly": false,
@@ -560,9 +565,11 @@
                         "boolean",
                         "null"
                     ],
-                    "versionAdded": "v1_4_0"
+                    "versionAdded": "v1_4_0",
+                    "versionDeprecated": "v1_15_0"
                 },
                 "HttpPushUriTargets": {
+                    "deprecated": "This property has been deprecated in favor of the update parameters used with `MultipartHttpPushUri`-provided software updates.",
                     "description": "An array of URIs that indicate where to apply the update image.",
                     "format": "uri-reference",
                     "items": {
@@ -574,9 +581,11 @@
                     "longDescription": "This property shall contain zero or more URIs that indicate where to apply the update image when using the URI specified by the `HttpPushUri` property to push a software image.  These targets should correspond to software inventory instances or their related items.  If this property is not present or contains no targets, the service shall apply the software image to all applicable targets, as determined by the service.  If the target specifies a device resource, the software image file shall be applied to the specified device.  If the target specifies a resource collection, the software image shall be applied to each applicable member of the specified collection.  If the target resource specifies an `Aggregate` resource, the software image file shall be applied to each applicable element of the specified aggregate.  If the target resource specifies a `ComputerSystem` resource, the software image file shall be applied to the applicable components within the specified computer system.",
                     "readonly": false,
                     "type": "array",
-                    "versionAdded": "v1_2_0"
+                    "versionAdded": "v1_2_0",
+                    "versionDeprecated": "v1_15_0"
                 },
                 "HttpPushUriTargetsBusy": {
+                    "deprecated": "This property has been deprecated in favor of `MultipartHttpPushUri`-provided software updates.",
                     "description": "An indication of whether any client has reserved the `HttpPushUriTargets` property.",
                     "longDescription": "This property shall indicate whether any client has reserved the `HttpPushUriTargets` property for firmware updates.  A client should set this property to `true` when it uses `HttpPushUriTargets` for firmware updates.  A client should set it to `false` when it no longer uses `HttpPushUriTargets` for updates.  The property can provide multiple clients a way to negotiate ownership of `HttpPushUriTargets` and helps clients determine whether another client is using `HttpPushUriTargets` to make firmware updates.  This property has no functional requirements for the service.",
                     "readonly": false,
@@ -584,7 +593,8 @@
                         "boolean",
                         "null"
                     ],
-                    "versionAdded": "v1_2_0"
+                    "versionAdded": "v1_2_0",
+                    "versionDeprecated": "v1_15_0"
                 },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
@@ -708,6 +718,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#UpdateService.v1_14_1.UpdateService"
+    "release": "2024.4",
+    "title": "#UpdateService.v1_15_0.UpdateService"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Volume.v1_10_0.json b/redfish-core/schema/dmtf/json-schema/Volume.v1_10_1.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/Volume.v1_10_0.json
rename to redfish-core/schema/dmtf/json-schema/Volume.v1_10_1.json
index 9803ce7..8f13531 100644
--- a/redfish-core/schema/dmtf/json-schema/Volume.v1_10_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Volume.v1_10_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.v1_10_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.v1_10_1.json",
     "$ref": "#/definitions/Volume",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2015-2024 Storage Networking Industry Association (SNIA), USA. All rights reserved.",
@@ -1376,7 +1376,7 @@
                     "versionAdded": "v1_5_0"
                 },
                 "IOStatistics": {
-                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/IOStatistics.v1_0_1.json#/definitions/IOStatistics",
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/IOStatistics.json#/definitions/IOStatistics",
                     "deprecated": "This property is deprecated in favor of the IOStatistics property in VolumeMetrics.",
                     "description": "Statistics for this volume.",
                     "longDescription": "The value shall represent IO statistics for this volume.",
@@ -1740,5 +1740,5 @@
     },
     "owningEntity": "SNIA",
     "release": "1.2.6",
-    "title": "#Volume.v1_10_0.Volume"
+    "title": "#Volume.v1_10_1.Volume"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/odata-v4.json b/redfish-core/schema/dmtf/json-schema/odata-v4.json
index 9d8bf84..76ca092 100644
--- a/redfish-core/schema/dmtf/json-schema/odata-v4.json
+++ b/redfish-core/schema/dmtf/json-schema/odata-v4.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/odata-v4.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_5.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "definitions": {
         "context": {
diff --git a/redfish-core/schema/dmtf/json-schema/odata.v4_0_5.json b/redfish-core/schema/dmtf/json-schema/odata.v4_0_5.json
index 102441c..76ca092 100644
--- a/redfish-core/schema/dmtf/json-schema/odata.v4_0_5.json
+++ b/redfish-core/schema/dmtf/json-schema/odata.v4_0_5.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/odata-v4_0_4.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_5.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "definitions": {
         "context": {
diff --git a/redfish-core/schema/dmtf/json-schema/redfish-schema-v1.json b/redfish-core/schema/dmtf/json-schema/redfish-schema-v1.json
index 7eaa9e1..b6f170f 100644
--- a/redfish-core/schema/dmtf/json-schema/redfish-schema-v1.json
+++ b/redfish-core/schema/dmtf/json-schema/redfish-schema-v1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_10_0",
+    "$id": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_10_1",
     "type": "object",
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "Redfish Schema Extension",
@@ -12,9 +12,9 @@
         "requiredOnCreate": {
             "type": "array",
             "items": {
-                "type": "boolean"
+                "type": "string"
             },
-            "description": "This property is required to be specified in the body of a POST request to create the resource."
+            "description": "These properties are required to be specified in the body of a POST request to create the resource."
         },
         "requiredParameter": {
             "type": "boolean",
diff --git a/redfish-core/schema/dmtf/json-schema/redfish-schema.v1_10_0.json b/redfish-core/schema/dmtf/json-schema/redfish-schema.v1_10_1.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/redfish-schema.v1_10_0.json
rename to redfish-core/schema/dmtf/json-schema/redfish-schema.v1_10_1.json
index 7eaa9e1..b6f170f 100644
--- a/redfish-core/schema/dmtf/json-schema/redfish-schema.v1_10_0.json
+++ b/redfish-core/schema/dmtf/json-schema/redfish-schema.v1_10_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_10_0",
+    "$id": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_10_1",
     "type": "object",
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "Redfish Schema Extension",
@@ -12,9 +12,9 @@
         "requiredOnCreate": {
             "type": "array",
             "items": {
-                "type": "boolean"
+                "type": "string"
             },
-            "description": "This property is required to be specified in the body of a POST request to create the resource."
+            "description": "These properties are required to be specified in the body of a POST request to create the resource."
         },
         "requiredParameter": {
             "type": "boolean",
diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index d0e3060..48832a8 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.3"
+VERSION = "DSP8010_2024.4"
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))