diff --git a/redfish-core/include/generated/enums/drive.hpp b/redfish-core/include/generated/enums/drive.hpp
index 6bf5094..abf3205 100644
--- a/redfish-core/include/generated/enums/drive.hpp
+++ b/redfish-core/include/generated/enums/drive.hpp
@@ -89,6 +89,19 @@
     Partial,
 };
 
+enum class TargetConfigurationLockLevel{
+    Invalid,
+    Baseline,
+};
+
+enum class ConfigLockOptions{
+    Invalid,
+    Unlocked,
+    Locked,
+    LockdownUnsupported,
+    CommandUnsupported,
+};
+
 NLOHMANN_JSON_SERIALIZE_ENUM(MediaType, {
     {MediaType::Invalid, "Invalid"},
     {MediaType::HDD, "HDD"},
@@ -173,5 +186,18 @@
     {ConfigurationLock::Partial, "Partial"},
 });
 
+NLOHMANN_JSON_SERIALIZE_ENUM(TargetConfigurationLockLevel, {
+    {TargetConfigurationLockLevel::Invalid, "Invalid"},
+    {TargetConfigurationLockLevel::Baseline, "Baseline"},
+});
+
+NLOHMANN_JSON_SERIALIZE_ENUM(ConfigLockOptions, {
+    {ConfigLockOptions::Invalid, "Invalid"},
+    {ConfigLockOptions::Unlocked, "Unlocked"},
+    {ConfigLockOptions::Locked, "Locked"},
+    {ConfigLockOptions::LockdownUnsupported, "LockdownUnsupported"},
+    {ConfigLockOptions::CommandUnsupported, "CommandUnsupported"},
+});
+
 }
 // clang-format on
diff --git a/redfish-core/include/generated/enums/physical_context.hpp b/redfish-core/include/generated/enums/physical_context.hpp
index aead54e..8ec14c2 100644
--- a/redfish-core/include/generated/enums/physical_context.hpp
+++ b/redfish-core/include/generated/enums/physical_context.hpp
@@ -54,6 +54,10 @@
     Transceiver,
     Battery,
     Pump,
+    Filter,
+    Reservoir,
+    Switch,
+    Manager,
 };
 
 enum class PhysicalSubContext{
@@ -121,6 +125,10 @@
     {PhysicalContext::Transceiver, "Transceiver"},
     {PhysicalContext::Battery, "Battery"},
     {PhysicalContext::Pump, "Pump"},
+    {PhysicalContext::Filter, "Filter"},
+    {PhysicalContext::Reservoir, "Reservoir"},
+    {PhysicalContext::Switch, "Switch"},
+    {PhysicalContext::Manager, "Manager"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(PhysicalSubContext, {
diff --git a/redfish-core/include/generated/enums/storage.hpp b/redfish-core/include/generated/enums/storage.hpp
index 4e845c4..989f1ee 100644
--- a/redfish-core/include/generated/enums/storage.hpp
+++ b/redfish-core/include/generated/enums/storage.hpp
@@ -23,6 +23,9 @@
     Disabled,
     UseExternalKey,
     UseLocalKey,
+    PasswordOnly,
+    PasswordWithExternalKey,
+    PasswordWithLocalKey,
 };
 
 enum class AutoVolumeCreate{
@@ -40,6 +43,19 @@
     Partial,
 };
 
+enum class TargetConfigurationLockLevel{
+    Invalid,
+    Baseline,
+};
+
+enum class ConfigLockOptions{
+    Invalid,
+    Unlocked,
+    Locked,
+    LockdownUnsupported,
+    CommandUnsupported,
+};
+
 NLOHMANN_JSON_SERIALIZE_ENUM(ResetToDefaultsType, {
     {ResetToDefaultsType::Invalid, "Invalid"},
     {ResetToDefaultsType::ResetAll, "ResetAll"},
@@ -58,6 +74,9 @@
     {EncryptionMode::Disabled, "Disabled"},
     {EncryptionMode::UseExternalKey, "UseExternalKey"},
     {EncryptionMode::UseLocalKey, "UseLocalKey"},
+    {EncryptionMode::PasswordOnly, "PasswordOnly"},
+    {EncryptionMode::PasswordWithExternalKey, "PasswordWithExternalKey"},
+    {EncryptionMode::PasswordWithLocalKey, "PasswordWithLocalKey"},
 });
 
 NLOHMANN_JSON_SERIALIZE_ENUM(AutoVolumeCreate, {
@@ -75,5 +94,18 @@
     {ConfigurationLock::Partial, "Partial"},
 });
 
+NLOHMANN_JSON_SERIALIZE_ENUM(TargetConfigurationLockLevel, {
+    {TargetConfigurationLockLevel::Invalid, "Invalid"},
+    {TargetConfigurationLockLevel::Baseline, "Baseline"},
+});
+
+NLOHMANN_JSON_SERIALIZE_ENUM(ConfigLockOptions, {
+    {ConfigLockOptions::Invalid, "Invalid"},
+    {ConfigLockOptions::Unlocked, "Unlocked"},
+    {ConfigLockOptions::Locked, "Locked"},
+    {ConfigLockOptions::LockdownUnsupported, "LockdownUnsupported"},
+    {ConfigLockOptions::CommandUnsupported, "CommandUnsupported"},
+});
+
 }
 // clang-format on
diff --git a/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml b/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
index 423f5ab..a7d82ad 100644
--- a/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/AggregationSource_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  AggregationSource v1.4.1                                            -->
+<!--# Redfish Schema:  AggregationSource v1.4.2                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -143,8 +143,8 @@
         <Annotation Term="OData.LongDescription" String="This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
         <NavigationProperty Name="ConnectionMethod" Type="ConnectionMethod.ConnectionMethod" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="An array of links to the connection methods used to contact this aggregation source."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `ConnectionMethod` that are used to connect to the aggregation source."/>
+          <Annotation Term="OData.Description" String="A link to the connection method used to contact this aggregation source."/>
+          <Annotation Term="OData.LongDescription" String="This property shall a link to a resource of type `ConnectionMethod` that represents the method used to connect to the aggregation source."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
         <NavigationProperty Name="ResourcesAccessed" Type="Collection(Resource.Resource)">
@@ -190,6 +190,12 @@
       <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_0_2.AggregationSource"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_0_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for `ConnectionMethod` to show it's singular."/>
+      <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_0_3.AggregationSource"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -332,6 +338,12 @@
       <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_1_2.AggregationSource"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_1_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for `ConnectionMethod` to show it's singular."/>
+      <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_1_3.AggregationSource"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.3"/>
@@ -382,6 +394,12 @@
       <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_2_2.AggregationSource"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_2_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for `ConnectionMethod` to show it's singular."/>
+      <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_2_3.AggregationSource"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -458,6 +476,12 @@
       <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_3_2.AggregationSource"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for `ConnectionMethod` to show it's singular."/>
+      <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_3_3.AggregationSource"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -472,5 +496,11 @@
       <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_4_0.AggregationSource"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_4_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for `ConnectionMethod` to show it's singular."/>
+      <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_4_1.AggregationSource"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Certificate_v1.xml b/redfish-core/schema/dmtf/csdl/Certificate_v1.xml
index 8f60d34..371c385 100644
--- a/redfish-core/schema/dmtf/csdl/Certificate_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Certificate_v1.xml
@@ -269,13 +269,13 @@
         <Property Name="CertificateString" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The string for the certificate."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the certificate, and the format shall follow the requirements specified by the `CertificateType` property value.  If the certificate contains any private keys, they shall be removed from the string in responses.  If the service does not know the private key for the certificate and is needed to use the certificate, the client shall provide the private key as part of the string in the `POST` request."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the certificate, and the format shall follow the requirements specified by the `CertificateType` property value.  If the certificate contains any private keys, they shall be removed from the string in responses.  If the service does not know the private key for the certificate and is needed to use the certificate, the client shall provide the private key as part of the string in the `POST` request.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."/>
           <Annotation Term="Redfish.RequiredOnCreate"/>
         </Property>
         <Property Name="CertificateType" Type="Certificate.CertificateType">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The format of the certificate."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the format type for the certificate."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the format type for the certificate.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."/>
           <Annotation Term="Redfish.RequiredOnCreate"/>
         </Property>
         <Property Name="Issuer" Type="Certificate.v1_0_0.Identifier" Nullable="false">
@@ -408,6 +408,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_0_6.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_0_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_0_7.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -488,6 +494,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_1_5.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_1_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_1_6.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -537,6 +549,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_2_5.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_2_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_2_6.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -585,6 +603,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_3_2.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_3_3.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -702,6 +726,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_4_2.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_4_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_4_3.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.3"/>
@@ -743,6 +773,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_5_2.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_5_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_5_3.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -785,6 +821,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_6_1.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_6_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_6_2.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -812,6 +854,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_7_1.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_7_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_7_2.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -832,5 +880,11 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_8_1.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_8_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_8_2.Certificate"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Circuit_v1.xml b/redfish-core/schema/dmtf/csdl/Circuit_v1.xml
index ad0a23f..953b209 100644
--- a/redfish-core/schema/dmtf/csdl/Circuit_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Circuit_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Circuit v1.8.0                                                      -->
+<!--# Redfish Schema:  Circuit v1.8.1                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -156,28 +156,28 @@
 
       <EnumType Name="PhaseWiringType">
         <Member Name="OnePhase3Wire">
-          <Annotation Term="OData.Description" String="Single-phase / 3-Wire (Line1, Neutral, Protective Earth)."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent a Single-phase / 3-Wire (Line1, Neutral, Protective Earth) wiring."/>
+          <Annotation Term="OData.Description" String="Single-phase / 3-wire (Line1, Neutral, Protective Earth)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall represent a single-phase / 3-wire (Line1, Neutral, Protective Earth) wiring."/>
         </Member>
         <Member Name="TwoPhase3Wire">
-          <Annotation Term="OData.Description" String="Two-phase / 3-Wire (Line1, Line2, Protective Earth)."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent a Two-phase / 3-Wire (Line1, Line2, Protective Earth) wiring."/>
+          <Annotation Term="OData.Description" String="Two-phase / 3-wire (Line1, Line2, Protective Earth)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall represent a two-phase / 3-wire (Line1, Line2, Protective Earth) wiring."/>
         </Member>
         <Member Name="OneOrTwoPhase3Wire">
-          <Annotation Term="OData.Description" String="Single or Two-Phase / 3-Wire (Line1, Line2 or Neutral, Protective Earth)."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent a Single or Two-Phase / 3-Wire (Line1, Line2 or Neutral, Protective Earth) wiring.  This value shall be used when both phase configurations are supported.  This is most common where detachable cordsets are used."/>
+          <Annotation Term="OData.Description" String="Single or two-phase / 3-wire (Line1, Line2 or Neutral, Protective Earth)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall represent a single or two-phase / 3-wire (Line1, Line2 or Neutral, Protective Earth) wiring.  This value shall be used when both phase configurations are supported.  This is most common where detachable cordsets are used.  If poly-phase properties such as `PolyPhaseVoltage` are supported, the service should populate the measurements as if the circuit is wired as Line1, Neutral, and Protective Earth."/>
         </Member>
         <Member Name="TwoPhase4Wire">
-          <Annotation Term="OData.Description" String="Two-phase / 4-Wire (Line1, Line2, Neutral, Protective Earth)."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent a Two-phase / 4-Wire (Line1, Line2, Neutral, Protective Earth) wiring."/>
+          <Annotation Term="OData.Description" String="Two-phase / 4-wire (Line1, Line2, Neutral, Protective Earth)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall represent a two-phase / 4-wire (Line1, Line2, Neutral, Protective Earth) wiring."/>
         </Member>
         <Member Name="ThreePhase4Wire">
-          <Annotation Term="OData.Description" String="Three-phase / 4-Wire (Line1, Line2, Line3, Protective Earth)."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent a Three-phase / 4-Wire (Line1, Line2, Line3, Protective Earth) wiring."/>
+          <Annotation Term="OData.Description" String="Three-phase / 4-wire (Line1, Line2, Line3, Protective Earth)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall represent a three-phase / 4-wire (Line1, Line2, Line3, Protective Earth) wiring."/>
         </Member>
         <Member Name="ThreePhase5Wire">
-          <Annotation Term="OData.Description" String="Three-phase / 5-Wire (Line1, Line2, Line3, Neutral, Protective Earth)."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent a Three-phase / 5-Wire (Line1, Line2, Line3, Neutral, Protective Earth) wiring."/>
+          <Annotation Term="OData.Description" String="Three-phase / 5-wire (Line1, Line2, Line3, Neutral, Protective Earth)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall represent a three-phase / 5-wire (Line1, Line2, Line3, Neutral, Protective Earth) wiring."/>
         </Member>
       </EnumType>
 
@@ -419,7 +419,7 @@
         </Member>
         <Member Name="California_CS8265">
           <Annotation Term="OData.Description" String="California Standard CS8265 (Single-phase 250V; 50A; 2P3W)."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent a plug that matches the 'California Standard' CS8265 style plug (Three-phase 250V; 50A; 3P4W)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall represent a plug that matches the 'California Standard' CS8265 style plug (Single-phase 250V; 50A; 2P3W)."/>
         </Member>
         <Member Name="California_CS8365">
           <Annotation Term="OData.Description" String="California Standard CS8365 (Three-phase 250V; 50A; 3P4W)."/>
@@ -583,13 +583,13 @@
         </Property>
         <NavigationProperty Name="Voltage" Type="Sensor.Sensor">
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
-          <Annotation Term="OData.Description" String="The voltage (V) for this single-phase circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage, in volt units, for this single-phase circuit.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`.  This property shall not appear in resource instances representing poly-phase circuits."/>
+          <Annotation Term="OData.Description" String="The voltage (V) for this circuit."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage, in volt units, for this circuit.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`.  This property shall not be present if `PhaseWiringType` contains a value that indicates a 4-wire or greater configuration, such as `TwoPhase4Wire`."/>
         </NavigationProperty>
         <NavigationProperty Name="CurrentAmps" Type="Sensor.Sensor">
           <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
-          <Annotation Term="OData.Description" String="The current (A) for this single-phase circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the current, in ampere units, for this single-phase circuit.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`.  This property shall not appear in resource instances representing poly-phase circuits."/>
+          <Annotation Term="OData.Description" String="The current (A) for this circuit."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current, in ampere units, for this circuit.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`.  This property shall not be present if `PhaseWiringType` contains a value that indicates a 4-wire or greater configuration, such as `TwoPhase4Wire`."/>
         </NavigationProperty>
         <NavigationProperty Name="PowerWatts" Type="Sensor.Sensor">
           <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
@@ -608,19 +608,19 @@
         </NavigationProperty>
         <Property Name="PolyPhaseVoltage" Type="Circuit.v1_0_0.VoltageSensors">
           <Annotation Term="OData.Description" String="The voltage readings for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage sensors for this circuit.  For single-phase circuits, this property shall contain a duplicate copy of the voltage sensor referenced in the `Voltage` property, if present.  For poly-phase circuits, this property should contain multiple voltage sensor readings used to fully describe the circuit."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage sensors for this circuit.  For 3-wire circuits, this property shall contain a duplicate copy of the voltage sensor referenced in the `Voltage` property, if present.  For other circuits, this property should contain multiple voltage sensor readings used to fully describe the circuit."/>
         </Property>
         <Property Name="PolyPhaseCurrentAmps" Type="Circuit.v1_0_0.CurrentSensors">
           <Annotation Term="OData.Description" String="The current readings for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the current sensors for this circuit.  For single-phase circuits, this property shall contain a duplicate copy of the current sensor referenced in the `CurrentAmps` property, if present.  For poly-phase circuits, this property should contain multiple current sensor readings used to fully describe the circuit."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current sensors for this circuit.  For 3-wire circuits, this property shall contain a duplicate copy of the current sensor referenced in the `CurrentAmps` property, if present.  For other circuits, this property should contain multiple current sensor readings used to fully describe the circuit."/>
         </Property>
         <Property Name="PolyPhasePowerWatts" Type="Circuit.v1_0_0.PowerSensors">
           <Annotation Term="OData.Description" String="The power readings for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the power sensors for this circuit.  For single-phase circuits, this property shall contain a duplicate copy of the power sensor referenced in the `PowerWatts` property, if present.  For poly-phase circuits, this property should contain multiple power sensor readings used to fully describe the circuit."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the power sensors for this circuit.  For 3-wire circuits, this property shall contain a duplicate copy of the power sensor referenced in the `PowerWatts` property, if present.  For other circuits, this property should contain multiple power sensor readings used to fully describe the circuit."/>
         </Property>
         <Property Name="PolyPhaseEnergykWh" Type="Circuit.v1_0_0.EnergySensors">
           <Annotation Term="OData.Description" String="The energy readings for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the energy sensors for this circuit.  For single-phase circuits, this property shall contain a duplicate copy of the energy sensor referenced in the `EnergykWh` property, if present.  For poly-phase circuits, this property should contain multiple energy sensor readings used to fully describe the circuit."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the energy sensors for this circuit.  For 3-wire circuits, this property shall contain a duplicate copy of the energy sensor referenced in the `EnergykWh` property, if present.  For other circuits, this property should contain multiple energy sensor readings used to fully describe the circuit."/>
         </Property>
         <Property Name="Links" Type="Circuit.v1_0_0.Links" Nullable="false">
           <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
@@ -865,6 +865,12 @@
       <EntityType Name="Circuit" BaseType="Circuit.v1_0_4.Circuit"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_0_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Circuit" BaseType="Circuit.v1_0_5.Circuit"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -903,6 +909,12 @@
       <EntityType Name="Circuit" BaseType="Circuit.v1_1_3.Circuit"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_1_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Circuit" BaseType="Circuit.v1_1_4.Circuit"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -929,6 +941,12 @@
       <EntityType Name="Circuit" BaseType="Circuit.v1_2_2.Circuit"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_2_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Circuit" BaseType="Circuit.v1_2_3.Circuit"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -960,6 +978,12 @@
       <EntityType Name="Circuit" BaseType="Circuit.v1_3_2.Circuit"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Circuit" BaseType="Circuit.v1_3_3.Circuit"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.3"/>
@@ -1028,6 +1052,12 @@
       <EntityType Name="Circuit" BaseType="Circuit.v1_4_2.Circuit"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_4_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Circuit" BaseType="Circuit.v1_4_3.Circuit"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -1074,6 +1104,12 @@
       <EntityType Name="Circuit" BaseType="Circuit.v1_5_1.Circuit"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_5_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Circuit" BaseType="Circuit.v1_5_2.Circuit"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -1094,6 +1130,12 @@
       <EntityType Name="Circuit" BaseType="Circuit.v1_6_1.Circuit"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_6_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Circuit" BaseType="Circuit.v1_6_2.Circuit"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -1114,6 +1156,12 @@
       <EntityType Name="Circuit" BaseType="Circuit.v1_7_1.Circuit"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_7_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Circuit" BaseType="Circuit.v1_7_2.Circuit"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -1127,5 +1175,11 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_8_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Circuit" BaseType="Circuit.v1_8_0.Circuit"/>
+    </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 c8431bd..82705cc 100644
--- a/redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/ComputerSystem_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ComputerSystem v1.22.1                                              -->
+<!--# Redfish Schema:  ComputerSystem v1.22.2                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -399,7 +399,7 @@
         <Property Name="UUID" Type="Resource.UUID">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The UUID for this system."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the universally unique identifier number for this system.  RFC4122 describes methods to create this value.  The value should be considered to be opaque.  Client software should only treat the overall value as a UUID and should not interpret any subfields within the UUID.  If the system supports SMBIOS, the property value should follow the SMBIOS 2.6 and later recommendation for converting the SMBIOS 16-byte UUID structure into the Redfish canonical `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx` string format, so that the property value matches the byte order presented by current OS APIs, such as WMI and dmidecode."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the universally unique identifier number for this system.  RFC4122 describes methods to create this value.  The value should be considered to be opaque.  Client software should only treat the overall value as a UUID and should not interpret any subfields within the UUID.  If the system supports SMBIOS, the property value should follow the SMBIOS 2.6 and later recommendation for converting the SMBIOS 16-byte UUID structure into the Redfish canonical `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx` string format, so that the property value matches the byte order presented by current OS APIs, such as WMI and dmidecode.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."/>
         </Property>
         <Property Name="HostName" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -827,6 +827,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_0_21.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_0_23">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_0_22.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.1"/>
@@ -1068,6 +1074,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_1_19.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_1_21">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_1_20.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -1299,6 +1311,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_2_18.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_2_20">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_2_19.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.3"/>
@@ -1451,6 +1469,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_3_17.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_3_19">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_3_18.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -1579,6 +1603,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_4_16.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_4_18">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_4_17.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -1813,6 +1843,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_5_15.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_5_17">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_5_16.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -1946,6 +1982,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_6_13.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_6_15">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_6_14.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -2048,6 +2090,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_7_12.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_7_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_7_13.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -2135,6 +2183,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_8_11.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_8_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_8_12.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -2223,6 +2277,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_9_11.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_9_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_9_12.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -2304,6 +2364,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_10_10.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_10_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_10_11.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -2406,6 +2472,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_11_9.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_11_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_11_10.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -2474,6 +2546,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_12_8.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_12_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_12_9.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -2763,6 +2841,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_13_7.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_13_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_13_8.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"/>
@@ -2860,6 +2944,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_14_6.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_14_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_14_7.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"/>
@@ -3000,6 +3090,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_15_5.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_15_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_15_6.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"/>
@@ -3140,6 +3236,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_16_6.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_16_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_16_7.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"/>
@@ -3193,6 +3295,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_17_5.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_17_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_17_6.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"/>
@@ -3269,6 +3377,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_18_4.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_18_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_18_5.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"/>
@@ -3316,6 +3430,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_19_4.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_19_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_19_5.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"/>
@@ -3369,6 +3489,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_20_3.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_20_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_20_4.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"/>
@@ -3442,6 +3568,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_21_1.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_21_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_21_2.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"/>
@@ -3456,5 +3588,11 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_22_0.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_22_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_22_1.ComputerSystem"/>
+    </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 b5dbd9b..9578740 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.19.0                                                               -->
+<!--# Redfish Schema:  Drive 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                                           -->
@@ -37,7 +37,7 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Chassis_v1.xml">
     <edmx:Include Namespace="Chassis"/>
   </edmx:Reference>
-   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Assembly_v1.xml">
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Assembly_v1.xml">
     <edmx:Include Namespace="Assembly"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Protocol_v1.xml">
@@ -1984,15 +1984,15 @@
         </Property>
         <Property Name="ConfigurationLock" Type="Drive.v1_19_0.ConfigurationLock">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="Indicates whether in-band configuration requests to the drive are locked."/>
+          <Annotation Term="OData.Description" String="Indicates whether in-band configuration requests to the drive are locked.  Other properties, such as `ConfigurationLockState`, contain additional information regarding the status of the configuration lock."/>
           <Annotation Term="OData.LongDescription" String="This property shall indicate whether configuration requests to the drive are locked.  Services shall reject modification requests that contain the value `Partial`."/>
         </Property>
       </EntityType>
 
       <EnumType Name="ConfigurationLock">
         <Member Name="Enabled">
-          <Annotation Term="OData.Description" String="In-band configuration requests are locked.  Configuration requests include applying firmware, updating security keys, and other hardware settings.  It does not include managing the volumes or data on the drive."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate in-band configuration requests are locked."/>
+          <Annotation Term="OData.Description" String="In-band configuration requests are locked as specified by `TargetConfigurationLockLevel`."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate in-band configuration requests are locked as specified by `TargetConfigurationLockLevel`."/>
         </Member>
         <Member Name="Disabled">
           <Annotation Term="OData.Description" String="In-band configuration requests are not locked."/>
@@ -2005,5 +2005,95 @@
       </EnumType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_19_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions for `ConfigurationLock` to align with the new `TargetConfigurationLockLevel` property."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_19_0.Drive"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_20_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.2"/>
+
+      <EntityType Name="Drive" BaseType="Drive.v1_19_1.Drive">
+        <Property Name="BlockSecurityIDEnabled" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates if establishment of a TCG-defined security ID (SID) on the drive is blocked."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if establishment of a TCG-defined security ID (SID) on the drive is blocked.  The value `true` shall indicate the TCG-defined 'Block SID' command is sent to the drive during each drive boot sequence."/>
+        </Property>
+        <Property Name="TargetConfigurationLockLevel" Type="Drive.v1_20_0.TargetConfigurationLockLevel">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates the target configuration lock level for the drive based upon the state of the `ConfigurationLock` property.  Other properties, such as `ConfigurationLockState`, contain additional information regarding the status of the configuration lock."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the target configuration lock level for the drive.  For NVMe drives, services shall implement the locking requirements specified by SNIA's Swordfish NVMe Model Overview and Mapping Guide."/>
+        </Property>
+        <Property Name="NVMe" Type="Drive.v1_20_0.NVMe">
+          <Annotation Term="OData.Description" String="NVMe properties for this drive."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain NVMe-specific properties of this drive."/>
+        </Property>
+      </EntityType>
+
+      <EnumType Name="TargetConfigurationLockLevel">
+        <Member Name="Baseline">
+          <Annotation Term="OData.Description" String="The standard configuration lock level, corresponding to applying firmware, updating security keys, and modifying other hardware settings.  It does not include managing the volumes or data on the drive."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="ConfigLockOptions">
+        <Member Name="Unlocked">
+          <Annotation Term="OData.Description" String="The command is supported, able to be locked, and is currently unlocked."/>
+        </Member>
+        <Member Name="Locked">
+          <Annotation Term="OData.Description" String="The command is supported and is currently locked."/>
+        </Member>
+        <Member Name="LockdownUnsupported">
+          <Annotation Term="OData.Description" String="The command is supported but is not able to be locked."/>
+        </Member>
+        <Member Name="CommandUnsupported">
+          <Annotation Term="OData.Description" String="The command is not supported, therefore lockdown does not apply."/>
+        </Member>
+      </EnumType>
+
+      <ComplexType Name="NVMe">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="NVMe properties for a drive."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain NVMe-specific properties of a drive."/>
+        <Property Name="ConfigurationLockState" Type="Drive.v1_20_0.NVMeConfigurationLockState">
+          <Annotation Term="OData.Description" String="The configurable features that are able to be locked from in-band usage on an NVMe subsystem and their current lock state."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the configurable features that are able to be locked from in-band usage on an NVMe subsystem and their current lock state."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="NVMeConfigurationLockState">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The configurable features that are able to be locked on an NVMe subsystem and their current lock state."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the configurable features that are able to be locked on an NVMe subsystem and their current lock state."/>
+        <Property Name="FirmwareCommit" Type="Drive.v1_20_0.ConfigLockOptions">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The lock state of the NVMe-defined Firmware Commit command."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the lock state of the NVMe-defined Firmware Commit command."/>
+        </Property>
+        <Property Name="Lockdown" Type="Drive.v1_20_0.ConfigLockOptions">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The lock state of the NVMe-defined Lockdown command."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the lock state of the NVMe-defined Lockdown command."/>
+        </Property>
+        <Property Name="SecuritySend" Type="Drive.v1_20_0.ConfigLockOptions">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The lock state of the NVMe-defined Security Send command."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the lock state of the NVMe-defined Security Send command."/>
+        </Property>
+        <Property Name="FirmwareImageDownload" Type="Drive.v1_20_0.ConfigLockOptions">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The lock state of the NVMe-defined Firmware Image Download command."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the lock state of the NVMe-defined Firmware Image Download command."/>
+        </Property>
+        <Property Name="VPDWrite" Type="Drive.v1_20_0.ConfigLockOptions">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The lock state of the NVMe-MI-defined VPD Write command."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the lock state of the NVMe-MI-defined VPD Write command."/>
+        </Property>
+      </ComplexType>
+    </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 5a67a25..706416e 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.1                                           -->
+<!--# Redfish Schema:  EthernetInterface v1.12.2                                           -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -148,7 +148,7 @@
         <Property Name="HostName" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The DNS host name, without any domain information."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the DNS host name for this interface.  Modifying this property may modify the `HostName` in one or more `EthernetInterface` resources that belong to the same system, manager, or other device.  If this interface is subordinate to a `ComputerSystem` resource, modifying this property may modify the `HostName` of the `ComputerSystem` resource that contains this interface.  If this interface is subordinate to a `Manager` resource, modifying this property may modify the `HostName` of the `ManagerNetworkProtocol` resource of the `Manager` resource that contains this interface."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the DNS host name for this interface.  Modifying this property may modify the `HostName` in one or more `EthernetInterface` resources that belong to the same system, manager, or other device.  If this interface is subordinate to a `ComputerSystem` resource, modifying this property may modify the `HostName` of the `ComputerSystem` resource that contains this interface.  If this interface is subordinate to a `Manager` resource, modifying this property may modify the `HostName` of the `ManagerNetworkProtocol` resource of the `Manager` resource that contains this interface.  Services should ignore this property in modification requests if `FQDN` is also provided in the same request."/>
         </Property>
         <Property Name="FQDN" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -329,6 +329,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_0_15.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_0_17">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_0_16.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"/>
@@ -454,6 +460,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_1_13.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_1_15">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_1_14.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"/>
@@ -548,6 +560,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_2_12.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_2_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_2_13.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"/>
@@ -657,6 +675,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_3_11.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_3_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_3_12.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"/>
@@ -884,6 +908,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_4_10.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_4_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_4_11.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"/>
@@ -968,6 +998,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_5_8.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_5_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_5_9.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"/>
@@ -1052,6 +1088,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_6_6.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_6_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_6_7.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"/>
@@ -1087,6 +1129,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_7_2.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_7_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_7_3.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"/>
@@ -1113,6 +1161,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_8_2.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_8_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_8_3.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"/>
@@ -1187,6 +1241,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_9_2.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_9_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_9_3.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"/>
@@ -1215,6 +1275,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_10_1.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_10_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_10_2.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"/>
@@ -1259,6 +1325,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_11_1.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_11_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_11_2.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"/>
@@ -1278,5 +1350,11 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_12_0.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_12_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to recommend ignoring `HostName` in modification requests if `FQDN` is also in the same modification request."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_12_1.EthernetInterface"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml b/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
index 90b2cae..fa348f3 100644
--- a/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/LogEntry_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  LogEntry v1.16.1                                                    -->
+<!--# Redfish Schema:  LogEntry v1.16.2                                                    -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -1710,7 +1710,7 @@
         <NavigationProperty Name="RelatedLogEntries" Type="Collection(LogEntry.LogEntry)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="An array of links to other log entries that are related to this log entry."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `LogEntry` in this or other log services that are related to this log entry."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type `LogEntry` in this or other log services that are related to this log entry.  This property should be used to link a log entry indicating the resolution of a condition with a log entry for the initial condition."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
       </ComplexType>
@@ -1746,6 +1746,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_12_4.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_12_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `RelatedLogEntries` should be used to link log entries that describe the initial condition from the log entry that describes the resolved condition."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_12_5.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -1789,6 +1795,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_13_4.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_13_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `RelatedLogEntries` should be used to link log entries that describe the initial condition from the log entry that describes the resolved condition."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_13_5.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_14_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -1865,6 +1877,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_14_3.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_14_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `RelatedLogEntries` should be used to link log entries that describe the initial condition from the log entry that describes the resolved condition."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_14_4.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_15_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -1920,6 +1938,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_15_2.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_15_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `RelatedLogEntries` should be used to link log entries that describe the initial condition from the log entry that describes the resolved condition."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_15_3.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_16_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -1938,5 +1962,11 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_16_0.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_16_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that `RelatedLogEntries` should be used to link log entries that describe the initial condition from the log entry that describes the resolved condition."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_16_1.LogEntry"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/MemoryRegion_v1.xml b/redfish-core/schema/dmtf/csdl/MemoryRegion_v1.xml
index 769214d..4b7b645 100644
--- a/redfish-core/schema/dmtf/csdl/MemoryRegion_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/MemoryRegion_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  MemoryRegion v1.0.2                                                 -->
+<!--# Redfish Schema:  MemoryRegion 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                                   -->
@@ -159,7 +159,7 @@
         </Property>
         <Property Name="Tag" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The user-assigned tag of this memory extent."/>
+          <Annotation Term="OData.Description" String="The tag of this memory extent."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain an opaque context attached to each extent to track usage of each extent or map extent to specific processes, transactions, or workloads on the host."/>
         </Property>
         <Property Name="SequenceNumber" Type="Edm.Int64">
@@ -224,5 +224,11 @@
       <EntityType Name="MemoryRegion" BaseType="MemoryRegion.v1_0_1.MemoryRegion"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryRegion.v1_0_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the defintion of the `Tag` property."/>
+      <EntityType Name="MemoryRegion" BaseType="MemoryRegion.v1_0_2.MemoryRegion"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/MetricReport_v1.xml b/redfish-core/schema/dmtf/csdl/MetricReport_v1.xml
index 5120e1a..985e108 100644
--- a/redfish-core/schema/dmtf/csdl/MetricReport_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/MetricReport_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  MetricReport v1.5.1                                                 -->
+<!--# Redfish Schema:  MetricReport v1.5.2                                                 -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -111,7 +111,7 @@
         <Property Name="MetricValue" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The metric value, as a string."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the metric value, as a string."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the metric value, as a string.  For numeric metrics, the service shall convert the number to a string representation of the number.  For array metrics, the service shall convert the array to an RFC8259-defined JSON string.  For boolean metrics, this property shall contain the strings `true` or `false`.  If the metric value is `null`, this property shall contain `null`."/>
         </Property>
         <Property Name="Timestamp" Type="Edm.DateTimeOffset">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -212,6 +212,12 @@
       <EntityType Name="MetricReport" BaseType="MetricReport.v1_0_8.MetricReport"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_0_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the `MetricValue` property to describe encoding behaviors for non-string metrics."/>
+      <EntityType Name="MetricReport" BaseType="MetricReport.v1_0_9.MetricReport"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -273,6 +279,12 @@
       <EntityType Name="MetricReport" BaseType="MetricReport.v1_1_7.MetricReport"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_1_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the `MetricValue` property to describe encoding behaviors for non-string metrics."/>
+      <EntityType Name="MetricReport" BaseType="MetricReport.v1_1_8.MetricReport"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -323,6 +335,12 @@
       <EntityType Name="MetricReport" BaseType="MetricReport.v1_2_5.MetricReport"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_2_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the `MetricValue` property to describe encoding behaviors for non-string metrics."/>
+      <EntityType Name="MetricReport" BaseType="MetricReport.v1_2_6.MetricReport"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -361,6 +379,12 @@
       <EntityType Name="MetricReport" BaseType="MetricReport.v1_3_5.MetricReport"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_3_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the `MetricValue` property to describe encoding behaviors for non-string metrics."/>
+      <EntityType Name="MetricReport" BaseType="MetricReport.v1_3_6.MetricReport"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -398,6 +422,12 @@
       <EntityType Name="MetricReport" BaseType="MetricReport.v1_4_3.MetricReport"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_4_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the `MetricValue` property to describe encoding behaviors for non-string metrics."/>
+      <EntityType Name="MetricReport" BaseType="MetricReport.v1_4_4.MetricReport"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -412,5 +442,11 @@
       <EntityType Name="MetricReport" BaseType="MetricReport.v1_5_0.MetricReport"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_5_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the `MetricValue` property to describe encoding behaviors for non-string metrics."/>
+      <EntityType Name="MetricReport" BaseType="MetricReport.v1_5_1.MetricReport"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Outlet_v1.xml b/redfish-core/schema/dmtf/csdl/Outlet_v1.xml
index cfb7562..f67dd6a 100644
--- a/redfish-core/schema/dmtf/csdl/Outlet_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Outlet_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Outlet v1.4.3                                                       -->
+<!--# Redfish Schema:  Outlet v1.4.4                                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -274,13 +274,13 @@
         </Property>
         <NavigationProperty Name="Voltage" Type="Sensor.Sensor">
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
-          <Annotation Term="OData.Description" String="The voltage (V) for this single-phase outlet."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage, in volt units, for this single-phase outlet.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`.  This property shall not appear in resource instances representing poly-phase outlets."/>
+          <Annotation Term="OData.Description" String="The voltage (V) for this outlet."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage, in volt units, for this outlet.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`.  This property shall not be present if `PhaseWiringType` contains a value that indicates a 4-wire or greater configuration, such as `TwoPhase4Wire`."/>
         </NavigationProperty>
         <NavigationProperty Name="CurrentAmps" Type="Sensor.Sensor">
           <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
-          <Annotation Term="OData.Description" String="The current (A) for this single-phase outlet."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the current, in ampere units, for this single-phase outlet.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`.  This property shall not appear in resource instances representing poly-phase outlets."/>
+          <Annotation Term="OData.Description" String="The current (A) for this outlet."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current, in ampere units, for this outlet.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`.  This property shall not be present if `PhaseWiringType` contains a value that indicates a 4-wire or greater configuration, such as `TwoPhase4Wire`."/>
         </NavigationProperty>
         <NavigationProperty Name="PowerWatts" Type="Sensor.Sensor">
           <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
@@ -300,11 +300,11 @@
 
         <Property Name="PolyPhaseVoltage" Type="Outlet.v1_0_0.VoltageSensors">
           <Annotation Term="OData.Description" String="The voltage readings for this outlet."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage readings for this outlet.  For single-phase outlets, this property shall contain a duplicate copy of the voltage sensor referenced in the `Voltage` property, if present.  For poly-phase outlets, this property should contain multiple voltage sensor readings used to fully describe the outlet."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage readings for this outlet.  For 3-wire outlets, this property shall contain a duplicate copy of the voltage sensor referenced in the `Voltage` property, if present.  For other outlets, this property should contain multiple voltage sensor readings used to fully describe the outlet."/>
         </Property>
         <Property Name="PolyPhaseCurrentAmps" Type="Outlet.v1_0_0.CurrentSensors">
           <Annotation Term="OData.Description" String="The current readings for this outlet."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the current readings for this outlet.  For single-phase outlets, this property shall contain a duplicate copy of the current sensor referenced in the `CurrentAmps` property, if present.  For poly-phase outlets, this property should contain multiple current sensor readings used to fully describe the outlet."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current readings for this outlet.  For 3-wire outlets, this property shall contain a duplicate copy of the current sensor referenced in the `CurrentAmps` property, if present.  For other outlets, this property should contain multiple current sensor readings used to fully describe the outlet."/>
         </Property>
 
         <Property Name="Links" Type="Outlet.v1_0_0.Links" Nullable="false">
@@ -452,6 +452,12 @@
       <EntityType Name="Outlet" BaseType="Outlet.v1_0_5.Outlet"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_0_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Outlet" BaseType="Outlet.v1_0_6.Outlet"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -496,6 +502,12 @@
       <EntityType Name="Outlet" BaseType="Outlet.v1_1_4.Outlet"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_1_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Outlet" BaseType="Outlet.v1_1_5.Outlet"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -533,6 +545,12 @@
       <EntityType Name="Outlet" BaseType="Outlet.v1_2_3.Outlet"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Outlet" BaseType="Outlet.v1_2_4.Outlet"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.3"/>
@@ -596,6 +614,12 @@
       <EntityType Name="Outlet" BaseType="Outlet.v1_3_3.Outlet"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_3_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Outlet" BaseType="Outlet.v1_3_4.Outlet"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -638,5 +662,11 @@
       <EntityType Name="Outlet" BaseType="Outlet.v1_4_2.Outlet"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_4_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions to explain voltage and current sensor properties in terms of the `PhaseWiringType`.  It was also created to correct various typographic errors and for consistent style."/>
+      <EntityType Name="Outlet" BaseType="Outlet.v1_4_3.Outlet"/>
+    </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 bcc1a54..c20c4f3 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.14.0                                                  -->
+<!--# Redfish Schema:  PCIeDevice 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                                   -->
@@ -1122,5 +1122,25 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PCIeDevice.v1_15_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.2"/>
+
+      <EntityType Name="PCIeDevice" BaseType="PCIeDevice.v1_14_0.PCIeDevice"/>
+
+      <ComplexType Name="PCIeErrors" BaseType="PCIeDevice.v1_13_0.PCIeErrors">
+        <Property Name="BadTLPCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of Bad TLPs issued on the PCIe link by the receiver."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of Bad TLPs issued on the PCIe link by the receiver.  A Bad TLP in the context of PCIe communication is a packet that cannot be properly processed due to errors at the transaction layer.  These errors could include corrupted data, incorrect packet formatting, invalid header information, or a mismatched checksum."/>
+        </Property>
+        <Property Name="BadDLLPCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of Bad DLLPs issued on the PCIe link by the receiver."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of Bad DLLPs issued on the PCIe link by the receiver.  A Bad DLLP in the context of PCIe communication is a packet that has encountered errors at the data link layer.  When a DLLP is considered bad, it means it has been corrupted or is incorrectly formatted, potentially due to transmission errors, hardware failures, or other issues that affect its integrity."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/PhysicalContext_v1.xml b/redfish-core/schema/dmtf/csdl/PhysicalContext_v1.xml
index f29eae7..cab36b4 100644
--- a/redfish-core/schema/dmtf/csdl/PhysicalContext_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/PhysicalContext_v1.xml
@@ -385,6 +385,50 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="Filter">
+          <Annotation Term="OData.Description" String="A filter."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="2024.2"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="Reservoir">
+          <Annotation Term="OData.Description" String="A reservoir."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="2024.2"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="Switch">
+          <Annotation Term="OData.Description" String="A switch device."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="2024.2"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="Manager">
+          <Annotation Term="OData.Description" String="A management controller, such as a BMC (baseboard management controller)."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="2024.2"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <EnumType Name="PhysicalSubContext">
diff --git a/redfish-core/schema/dmtf/csdl/Port_v1.xml b/redfish-core/schema/dmtf/csdl/Port_v1.xml
index 396620a..febc639 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.12.0                                                        -->
+<!--# Redfish Schema:  Port v1.13.0                                                        -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -1189,6 +1189,7 @@
       </EnumType>
 
       <ComplexType Name="SFP">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
         <Annotation Term="OData.Description" String="A small form-factor pluggable (SFP) device attached to a port."/>
         <Annotation Term="OData.LongDescription" String="This type shall describe a small form-factor pluggable (SFP) device attached to a port."/>
         <Property Name="Status" Type="Resource.Status" Nullable="false">
@@ -1909,5 +1910,26 @@
       <EntityType Name="Port" BaseType="Port.v1_11_1.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"/>
+
+      <EntityType Name="Port" BaseType="Port.v1_12_0.Port"/>
+
+      <ComplexType Name="SFP" BaseType="Port.v1_4_0.SFP">
+        <Property Name="Version" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The hardware version of this SFP."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the hardware version of this SFP as determined by the vendor or supplier."/>
+        </Property>
+        <Property Name="VendorOUI" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The IEEE OUI of the vendor of this SFP."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the IEEE organizationally unique identifier (OUI) of the vendor of this SFP."/>
+          <Annotation Term="Validation.Pattern" String="^([0-9A-Fa-f]{2}-){2}([0-9A-Fa-f]{2})$"/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Processor_v1.xml b/redfish-core/schema/dmtf/csdl/Processor_v1.xml
index 7588107..6d2541c 100644
--- a/redfish-core/schema/dmtf/csdl/Processor_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Processor_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Processor v1.20.0                                                   -->
+<!--# Redfish Schema:  Processor v1.20.1                                                   -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -208,7 +208,7 @@
         </Property>
         <Property Name="ProcessorId" Type="Processor.v1_0_0.ProcessorId"  Nullable="false">
           <Annotation Term="OData.Description" String="The identification information for this processor."/>
-          <Annotation Term="OData.LongDescription" String="This object shall contain identification information for this processor."/>
+          <Annotation Term="OData.LongDescription" String="This object shall contain identification information for this processor.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."/>
         </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."/>
@@ -249,33 +249,33 @@
         <Property Name="VendorId" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The vendor identification for this processor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the vendor identification information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\d+$`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the vendor identification information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\d+$`.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."/>
         </Property>
         <Property Name="IdentificationRegisters" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The raw manufacturer-provided processor identification registers for this processor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the raw manufacturer-provided processor-specific identification registers of this processor's features."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the raw manufacturer-provided processor-specific identification registers of this processor's features.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."/>
           <Annotation Term="Validation.Pattern" String="^0x[0-9A-Fa-f]+$"/>
         </Property>
         <Property Name="EffectiveFamily" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The effective family for this processor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the effective family information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\d+$`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the effective family information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\d+$`.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."/>
         </Property>
         <Property Name="EffectiveModel" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The effective model for this processor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the effective model information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\d+$`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the effective model information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\d+$`.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."/>
         </Property>
         <Property Name="Step" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The step value for this processor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the step or revision information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\d+$`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the step or revision information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\d+$`.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."/>
         </Property>
         <Property Name="MicrocodeInfo" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The microcode information for this processor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the microcode information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\d+$`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the microcode information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\d+$`.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."/>
         </Property>
       </ComplexType>
 
@@ -545,6 +545,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_0_14.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_0_16">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_0_15.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -654,6 +660,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_1_10.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_1_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_1_11.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -738,6 +750,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_2_10.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_2_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_2_11.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -824,6 +842,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_3_11.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_3_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_3_12.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -1302,6 +1326,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_4_11.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_4_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_4_12.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -1382,6 +1412,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_5_10.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_5_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_5_11.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -1444,6 +1480,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_6_8.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_6_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_6_9.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -1520,6 +1562,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_7_7.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_7_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_7_8.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -1587,6 +1635,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_8_6.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_8_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_8_7.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -1677,6 +1731,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_9_5.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_9_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_9_6.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -1753,6 +1813,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_10_5.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_10_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_10_6.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -1864,6 +1930,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_11_5.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_11_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_11_6.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -1916,6 +1988,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_12_4.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_12_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_12_5.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1989,6 +2067,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_13_5.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_13_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_13_6.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_14_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -2027,6 +2111,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_14_4.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_14_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_14_5.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_15_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.1"/>
@@ -2063,6 +2153,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_15_3.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_15_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_15_4.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_16_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.2"/>
@@ -2150,6 +2246,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_16_3.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_16_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_16_4.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_17_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -2191,6 +2293,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_17_2.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_17_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_17_3.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_18_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -2211,6 +2319,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_18_1.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_18_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_18_2.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_19_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -2225,6 +2339,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_19_0.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_19_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_19_1.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_20_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
@@ -2239,5 +2359,11 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_20_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_20_0.Processor"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/RedfishExtensions_v1.xml b/redfish-core/schema/dmtf/csdl/RedfishExtensions_v1.xml
index 9547029..98f8465 100644
--- a/redfish-core/schema/dmtf/csdl/RedfishExtensions_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/RedfishExtensions_v1.xml
@@ -37,10 +37,10 @@
         <Annotation Term="OData.Description" String="The set of allowable values for an action parameter or read-write property."/>
       </Term>
       <Term Name="AllowableNumbers" Type="Collection(Edm.String)" Nullable="false">
-        <Annotation Term="OData.Description" String="The term specifies the numeric values or duration values, inclusive ranges of values, and incremental step values for a read-write property that are supported by the service, as defined in the 'Allowable values for numbers and durations' clause of the Redfish Specification."/>
+        <Annotation Term="OData.Description" String="The term specifies the numeric values or duration values, inclusive ranges of values, and incremental step values for an action parameter or a read-write property that are supported by the service, as defined in the 'Allowable values for numbers and durations' clause of the Redfish Specification."/>
       </Term>
       <Term Name="AllowablePattern" Type="Edm.String" Nullable="false">
-        <Annotation Term="OData.Description" String="The term specifies a regular expression that describes the allowable values for a read-write property as supported by the service."/>
+        <Annotation Term="OData.Description" String="The term specifies a regular expression that describes the allowable values for an action parameter or a read-write property as supported by the service."/>
       </Term>
       <Term Name="WriteableProperties" Type="Collection(Edm.String)" Nullable="false">
         <Annotation Term="OData.Description" String="The term specifies the properties supported as read-write.  The values contained are the names of the writable properties as defined in the Redfish schema that are available as read-write given the implementation, current configuration, and state of the resource.  This term might appear at the root level of a resource, or within an object.  For arrays of objects, the term might only appear in the first element of the array to indicate identical capabilities for every element in the array."/>
diff --git a/redfish-core/schema/dmtf/csdl/Resource_v1.xml b/redfish-core/schema/dmtf/csdl/Resource_v1.xml
index 6369ad6..dcaaa57 100644
--- a/redfish-core/schema/dmtf/csdl/Resource_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Resource_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Resource v1.19.0                                                    -->
+<!--# Redfish Schema:  Resource v1.19.1                                                    -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -109,7 +109,7 @@
         <Property Name="HealthRollup" Type="Resource.Health">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The overall health state from the view of this resource."/>
-          <Annotation Term="OData.LongDescription" String="This property shall represent the health state of the resource and its dependent resources.  The values shall conform to those defined in the Redfish Specification."/>
+          <Annotation Term="OData.LongDescription" String="This property shall represent the health state of the resource and its dependent resources.  The values shall conform to those defined in the Redfish Specification.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."/>
         </Property>
         <Property Name="Health" Type="Resource.Health">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -585,6 +585,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_0_16">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.1"/>
@@ -811,6 +816,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_1_18">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -897,6 +907,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_2_17">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.3"/>
@@ -1220,6 +1235,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_3_16">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -1296,6 +1316,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_4_15">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.2"/>
@@ -1511,6 +1536,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_5_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -1603,6 +1633,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_6_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -1712,6 +1747,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_7_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -1778,6 +1818,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_8_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -1834,6 +1879,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_9_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -1875,6 +1925,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_10_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.4"/>
@@ -1911,6 +1966,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to note that the array order of conditions may change as new conditions occur or are resolved by the service.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_11_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -1942,6 +2002,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to note that the array order of conditions may change as new conditions occur or are resolved by the service.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_12_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1968,6 +2033,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to note that the array order of conditions may change as new conditions occur or are resolved by the service.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_13_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.4"/>
@@ -1989,6 +2059,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to note that the array order of conditions may change as new conditions occur or are resolved by the service.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_14_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2022.3"/>
@@ -2005,6 +2080,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to note that the array order of conditions may change as new conditions occur or are resolved by the service.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_15_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.1"/>
@@ -2028,6 +2108,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to note that the array order of conditions may change as new conditions occur or are resolved by the service.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_16_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.2"/>
@@ -2093,6 +2178,11 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to note that the array order of conditions may change as new conditions occur or are resolved by the service.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_17_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2023.3"/>
@@ -2104,11 +2194,21 @@
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the values of `State` in `Status`.  It was also created to note that the array order of conditions may change as new conditions occur or are resolved by the service.  It was also created to force the regeneration of OpenAPI schemas to properly express nullable properties with external references.  It was also created to correct various typographical errors."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_18_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2024.1"/>
       <Annotation Term="OData.Description" String="This version was created to deprecate `Qualified` in `State` in favor of `StandbySpare`.  It was also created to add `Degraded` to `State`."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_19_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <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>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/Sensor_v1.xml b/redfish-core/schema/dmtf/csdl/Sensor_v1.xml
index fc1e079..87e1313 100644
--- a/redfish-core/schema/dmtf/csdl/Sensor_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Sensor_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Sensor v1.9.0                                                       -->
+<!--# Redfish Schema:  Sensor v1.10.0                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -211,7 +211,7 @@
         <Property Name="Reading" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The sensor value."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the sensor value."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`."/>
           <Annotation Term="Redfish.Excerpt"/>
         </Property>
         <Property Name="ReadingUnits" Type="Edm.String">
@@ -1243,5 +1243,18 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_10_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.2"/>
+
+      <EntityType Name="Sensor" BaseType="Sensor.v1_9_0.Sensor">
+        <Property Name="Enabled" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates whether the sensor is enabled and provides a reading."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the sensor is enabled and provides a `Reading`.  The value `true` shall indicate the sensor is enabled and returns the `Reading` property with a valid value.  The value `false` shall indicate the sensor is disabled, and shall not return the `Reading` property."/>
+        </Property>
+      </EntityType>
+    </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 5a71f24..07a9e81 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.16.0                                                                 -->
+<!--# Redfish Schema:  Storage 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                                               -->
@@ -161,8 +161,8 @@
           </Annotation>
         </Parameter>
         <Parameter Name="CurrentEncryptionKey" Type="Edm.String">
-          <Annotation Term="OData.Description" String="The current local encryption key on the storage subsystem."/>
-          <Annotation Term="OData.LongDescription" String="This parameter shall contain the current local encryption key on the storage subsystem.  Services may reject the action request if this parameter is not provided."/>
+          <Annotation Term="OData.Description" String="The current local encryption key on the storage subsystem.  This parameter is not needed if the controller does not currently have an encryption key."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the current local encryption key on the storage subsystem.  Services may reject the action request if this parameter is not provided or the value supplied does not match the current encryption key."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -205,6 +205,32 @@
           </Collection>
         </Annotation>
       </Action>
+
+      <Action Name="SetControllerPassword" IsBound="true">
+        <Annotation Term="OData.Description" String="This action sets the controller boot password for a host-based storage controller."/>
+        <Annotation Term="OData.LongDescription" String="This action shall set the controller boot password for a host-based storage controller."/>
+        <Parameter Name="Storage" Type="Storage.v1_0_0.Actions"/>
+        <Parameter Name="CurrentPassword" Type="Edm.String">
+          <Annotation Term="OData.Description" String="The current controller password.  This parameter is not needed if the controller does not currently have a password."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the current controller password.  Services may reject the action request if this parameter is not provided or the value supplied does not match the current password."/>
+        </Parameter>
+        <Parameter Name="NewPassword" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Description" String="The new password to set for the controller."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the new password to set for the controller."/>
+        </Parameter>
+        <Parameter Name="SecurityKey" Type="Edm.String">
+          <Annotation Term="OData.Description" String="The security key for the controller.  This parameter is not needed if the controller does not have a security key."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the controller security key.  Services may reject the action request if this parameter is not provided or the value provided does not match the security key for the controller."/>
+        </Parameter>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_17_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_0_0">
@@ -1421,6 +1447,39 @@
         <Member Name="UseLocalKey">
           <Annotation Term="OData.Description" String="The storage subsystem uses a local key for encryption."/>
         </Member>
+        <Member Name="PasswordOnly">
+          <Annotation Term="OData.Description" String="The storage subsystem uses a password, but no keys for encryption."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_17_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="PasswordWithExternalKey">
+          <Annotation Term="OData.Description" String="The storage subsystem uses a password and one or more external keys for encryption."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_17_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="PasswordWithLocalKey">
+          <Annotation Term="OData.Description" String="The storage subsystem uses a password and a local key for encryption."/>
+          <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>
 
       <EntityType Name="StorageController" BaseType="Storage.v1_13_0.StorageController"/>
@@ -1510,7 +1569,7 @@
         </Property>
         <Property Name="ConfigurationLock" Type="Storage.v1_16_0.ConfigurationLock">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="Indicates whether in-band configuration requests to the storage subsystem are locked."/>
+          <Annotation Term="OData.Description" String="Indicates whether in-band configuration requests to the storage subsystem are locked.  Other properties, such as `ConfigurationLockState`, contain additional information regarding the status of the configuration lock."/>
           <Annotation Term="OData.LongDescription" String="This property shall indicate whether configuration requests to the storage subsystem are locked.  Services shall reject modification requests that contain the value `Partial`.  Modifying the value of this property may affect the `ConfigurationLock` property in `Drive` resources referenced by the `Drives` property."/>
         </Property>
       </EntityType>
@@ -1534,8 +1593,8 @@
 
       <EnumType Name="ConfigurationLock">
         <Member Name="Enabled">
-          <Annotation Term="OData.Description" String="In-band configuration requests are locked.  Configuration requests include applying firmware, updating security keys, and other hardware settings.  It does not include managing the volumes or data within the storage subsystem."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate in-band configuration requests are locked."/>
+          <Annotation Term="OData.Description" String="In-band configuration requests are locked as specified by `TargetConfigurationLockLevel`."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate in-band configuration requests are locked as specified by `TargetConfigurationLockLevel`."/>
         </Member>
         <Member Name="Disabled">
           <Annotation Term="OData.Description" String="In-band configuration requests are not locked."/>
@@ -1548,5 +1607,87 @@
       </EnumType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_16_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions for `ConfigurationLock` to align with the new `TargetConfigurationLockLevel` property."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_16_0.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_16_0.StorageController"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_17_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2024.2"/>
+      <Annotation Term="OData.Description" String="This version was created to add the `SetControllerPassword` action.  It was also created to add `PasswordOnly`, `PasswordWithExternalKey`, and `PasswordWithLocalKey` to `EncryptionMode`."/>
+
+      <EntityType Name="Storage" BaseType="Storage.v1_16_1.Storage">
+        <Property Name="TargetConfigurationLockLevel" Type="Storage.v1_17_0.TargetConfigurationLockLevel">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates the target configuration lock level for the drive based upon the state of the `ConfigurationLock` property.  Other properties, such as `ConfigurationLockState`, contain additional information regarding the status of the configuration lock."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the target configuration lock level for the drive.  For NVMe subsystems, services shall implement the locking requirements specified by SNIA's Swordfish NVMe Model Overview and Mapping Guide."/>
+        </Property>
+      </EntityType>
+
+      <EntityType Name="StorageController" BaseType="Storage.v1_16_1.StorageController"/>
+
+      <EnumType Name="TargetConfigurationLockLevel">
+        <Member Name="Baseline">
+          <Annotation Term="OData.Description" String="The standard configuration lock level, corresponding to applying firmware, updating security keys, and modifying other hardware settings.  It does not include managing the volumes or data within the storage subsystem."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="ConfigLockOptions">
+        <Member Name="Unlocked">
+          <Annotation Term="OData.Description" String="The command is supported, able to be locked, and is currently unlocked."/>
+        </Member>
+        <Member Name="Locked">
+          <Annotation Term="OData.Description" String="The command is supported and is currently locked."/>
+        </Member>
+        <Member Name="LockdownUnsupported">
+          <Annotation Term="OData.Description" String="The command is supported but is not able to be locked."/>
+        </Member>
+        <Member Name="CommandUnsupported">
+          <Annotation Term="OData.Description" String="The command is not supported, therefore lockdown does not apply."/>
+        </Member>
+      </EnumType>
+
+      <ComplexType Name="NVMeConfigurationLockState">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The configurable features that are able to be locked on an NVMe subsystem and their current lock state."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the configurable features that are able to be locked on an NVMe subsystem and their current lock state."/>
+        <Property Name="FirmwareCommit" Type="Storage.v1_17_0.ConfigLockOptions">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The lock state of the NVMe-defined Firmware Commit command."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the lock state of the NVMe-defined Firmware Commit command."/>
+        </Property>
+        <Property Name="Lockdown" Type="Storage.v1_17_0.ConfigLockOptions">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The lock state of the NVMe-defined Lockdown command."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the lock state of the NVMe-defined Lockdown command."/>
+        </Property>
+        <Property Name="SecuritySend" Type="Storage.v1_17_0.ConfigLockOptions">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The lock state of the NVMe-defined Security Send command."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the lock state of the NVMe-defined Security Send command."/>
+        </Property>
+        <Property Name="FirmwareImageDownload" Type="Storage.v1_17_0.ConfigLockOptions">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The lock state of the NVMe-defined Firmware Image Download command."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the lock state of the NVMe-defined Firmware Image Download command."/>
+        </Property>
+        <Property Name="VPDWrite" Type="Storage.v1_17_0.ConfigLockOptions">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The lock state of the NVMe-MI-defined VPD Write command."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the lock state of the NVMe-MI-defined VPD Write command."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="NVMeSubsystemProperties" BaseType="Storage.v1_16_0.NVMeSubsystemProperties">
+        <Property Name="ConfigurationLockState" Type="Storage.v1_17_0.NVMeConfigurationLockState">
+          <Annotation Term="OData.Description" String="The configurable features that are able to be locked from in-band usage on an NVMe subsystem and their current lock state."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the configurable features that are able to be locked from in-band usage on an NVMe subsystem and their current lock state."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/csdl/VolumeCollection_v1.xml b/redfish-core/schema/dmtf/csdl/VolumeCollection_v1.xml
index 1f92a23..7488908 100644
--- a/redfish-core/schema/dmtf/csdl/VolumeCollection_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/VolumeCollection_v1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
-<!-- Copyright 2015-2023 Storage Networking Industry Association (SNIA), USA. All rights reserved.-->
+<!-- Copyright 2015-2024 Storage Networking Industry Association (SNIA), USA. All rights reserved.-->
 <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">
diff --git a/redfish-core/schema/dmtf/csdl/Volume_v1.xml b/redfish-core/schema/dmtf/csdl/Volume_v1.xml
index 843979e..8ae23da 100644
--- a/redfish-core/schema/dmtf/csdl/Volume_v1.xml
+++ b/redfish-core/schema/dmtf/csdl/Volume_v1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
-<!-- Copyright 2015-2023 Storage Networking Industry Association (SNIA), USA. All rights reserved.-->
+<!-- Copyright 2015-2024 Storage Networking Industry Association (SNIA), USA. All rights reserved.-->
 
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
 
@@ -81,6 +81,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Connection_v1.xml">
     <edmx:Include Namespace="Connection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/StoragePool_v1.xml">
+    <edmx:Include Namespace="StoragePool"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -1037,12 +1040,22 @@
         <Property Name="IOStatistics" Type="IOStatistics.v1_0_1.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">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_10_0"/>
+                <PropertyValue Property="Description" String="This property is deprecated in favor of the IOStatistics property in VolumeMetrics."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Property>
         <Property Name="RemainingCapacityPercent" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The percentage of the capacity remaining in the Volume."/>
           <Annotation Term="OData.LongDescription" String="If present, this value shall return  {[(SUM(AllocatedBytes) - SUM(ConsumedBytes)]/SUM(AllocatedBytes)}*100 represented as an integer value."/>
         </Property>
+
       </EntityType>
 
       <ComplexType Name="Links" BaseType="Volume.v1_1_0.Links">
@@ -1577,12 +1590,49 @@
       </ComplexType>
     </Schema>
 
-        <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_10_0">
+    <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."/>
+      <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."/>
       <Annotation Term="Redfish.Release" String="1.2.6"/>
       <EntityType Name="Volume" BaseType="Volume.v1_9_0.Volume">
+        <Property Name="ALUA" Type="Volume.v1_10_0.ALUA">
+          <Annotation Term="OData.Description" String="ALUA properties for this volume."/>
+          <Annotation Term="OData.LongDescription" String="This shall identify the ALUA properties for this volume."/>
+        </Property>
       </EntityType>
+
+      <ComplexType Name="ALUA">
+        <Property Name="ANAGroupId" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The ANA group id for this volume."/>
+          <Annotation Term="OData.LongDescription" String="This shall contain the ANA group id for this volume."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="NVMeNamespaceProperties" BaseType="Volume.v1_9_0.NVMeNamespaceProperties">
+        <Annotation Term="OData.Description" String="Add the SupportsMultipathandSharing, and ReservationCapabilities properties."/>
+        <Property Name="SupportsMultipleNamespaceAttachments" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates whether the namespace may be attached to two or more controllers."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the namespace may be attached to two or more controllers."/>
+        </Property>
+        <Property Name="SupportsIOPerformanceHints" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates whether the namespace supports IO performance hints."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the namespace supports IO performance hints."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="Links" BaseType="Volume.v1_9_0.Links">
+        <Annotation Term="OData.Description" String="Add the ProvidingStoragePool property."/>
+        <NavigationProperty Name="ProvidingStoragePool" Type="StoragePool.StoragePool">
+          <Annotation Term="OData.Description" String="The StoragePool resource that provides this volume resource."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="This property shall contain a pointer to the StoragePool resource that provides this volume resource."/>
+        </NavigationProperty>
+      </ComplexType>
+
     </Schema>
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_1.json b/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_2.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_1.json
rename to redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_2.json
index 9afec89..b559105 100644
--- a/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_1.json
+++ b/redfish-core/schema/dmtf/json-schema/AggregationSource.v1_4_2.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/AggregationSource.v1_4_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/AggregationSource.v1_4_2.json",
     "$ref": "#/definitions/AggregationSource",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -251,8 +251,8 @@
             "properties": {
                 "ConnectionMethod": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/ConnectionMethod.json#/definitions/ConnectionMethod",
-                    "description": "An array of links to the connection methods used to contact this aggregation source.",
-                    "longDescription": "This property shall contain an array of links to resources of type `ConnectionMethod` that are used to connect to the aggregation source.",
+                    "description": "A link to the connection method used to contact this aggregation source.",
+                    "longDescription": "This property shall a link to a resource of type `ConnectionMethod` that represents the method used to connect to the aggregation source.",
                     "readonly": true
                 },
                 "Oem": {
@@ -576,5 +576,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.3",
-    "title": "#AggregationSource.v1_4_1.AggregationSource"
+    "title": "#AggregationSource.v1_4_2.AggregationSource"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Certificate.v1_8_2.json b/redfish-core/schema/dmtf/json-schema/Certificate.v1_8_3.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Certificate.v1_8_2.json
rename to redfish-core/schema/dmtf/json-schema/Certificate.v1_8_3.json
index 79f7595..540a38a 100644
--- a/redfish-core/schema/dmtf/json-schema/Certificate.v1_8_2.json
+++ b/redfish-core/schema/dmtf/json-schema/Certificate.v1_8_3.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Certificate.v1_8_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Certificate.v1_8_3.json",
     "$ref": "#/definitions/Certificate",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -75,7 +75,7 @@
                 },
                 "CertificateString": {
                     "description": "The string for the certificate.",
-                    "longDescription": "This property shall contain the certificate, and the format shall follow the requirements specified by the `CertificateType` property value.  If the certificate contains any private keys, they shall be removed from the string in responses.  If the service does not know the private key for the certificate and is needed to use the certificate, the client shall provide the private key as part of the string in the `POST` request.",
+                    "longDescription": "This property shall contain the certificate, and the format shall follow the requirements specified by the `CertificateType` property value.  If the certificate contains any private keys, they shall be removed from the string in responses.  If the service does not know the private key for the certificate and is needed to use the certificate, the client shall provide the private key as part of the string in the `POST` request.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -92,7 +92,7 @@
                         }
                     ],
                     "description": "The format of the certificate.",
-                    "longDescription": "This property shall contain the format type for the certificate.",
+                    "longDescription": "This property shall contain the format type for the certificate.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification.",
                     "readonly": true
                 },
                 "CertificateUsageTypes": {
@@ -694,5 +694,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.2",
-    "title": "#Certificate.v1_8_2.Certificate"
+    "title": "#Certificate.v1_8_3.Certificate"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Circuit.v1_8_0.json b/redfish-core/schema/dmtf/json-schema/Circuit.v1_8_1.json
similarity index 96%
rename from redfish-core/schema/dmtf/json-schema/Circuit.v1_8_0.json
rename to redfish-core/schema/dmtf/json-schema/Circuit.v1_8_1.json
index fb5d58b..67654d3 100644
--- a/redfish-core/schema/dmtf/json-schema/Circuit.v1_8_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Circuit.v1_8_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Circuit.v1_8_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Circuit.v1_8_1.json",
     "$ref": "#/definitions/Circuit",
     "$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",
@@ -165,9 +165,9 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The current (A) for this single-phase circuit.",
+                    "description": "The current (A) for this circuit.",
                     "excerptCopy": "SensorCurrentExcerpt",
-                    "longDescription": "This property shall contain the current, in ampere units, for this single-phase circuit.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`.  This property shall not appear in resource instances representing poly-phase circuits."
+                    "longDescription": "This property shall contain the current, in ampere units, for this circuit.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`.  This property shall not be present if `PhaseWiringType` contains a value that indicates a 4-wire or greater configuration, such as `TwoPhase4Wire`."
                 },
                 "Description": {
                     "anyOf": [
@@ -349,7 +349,7 @@
                         }
                     ],
                     "description": "The current readings for this circuit.",
-                    "longDescription": "This property shall contain the current sensors for this circuit.  For single-phase circuits, this property shall contain a duplicate copy of the current sensor referenced in the `CurrentAmps` property, if present.  For poly-phase circuits, this property should contain multiple current sensor readings used to fully describe the circuit."
+                    "longDescription": "This property shall contain the current sensors for this circuit.  For 3-wire circuits, this property shall contain a duplicate copy of the current sensor referenced in the `CurrentAmps` property, if present.  For other circuits, this property should contain multiple current sensor readings used to fully describe the circuit."
                 },
                 "PolyPhaseEnergykWh": {
                     "anyOf": [
@@ -361,7 +361,7 @@
                         }
                     ],
                     "description": "The energy readings for this circuit.",
-                    "longDescription": "This property shall contain the energy sensors for this circuit.  For single-phase circuits, this property shall contain a duplicate copy of the energy sensor referenced in the `EnergykWh` property, if present.  For poly-phase circuits, this property should contain multiple energy sensor readings used to fully describe the circuit."
+                    "longDescription": "This property shall contain the energy sensors for this circuit.  For 3-wire circuits, this property shall contain a duplicate copy of the energy sensor referenced in the `EnergykWh` property, if present.  For other circuits, this property should contain multiple energy sensor readings used to fully describe the circuit."
                 },
                 "PolyPhasePowerWatts": {
                     "anyOf": [
@@ -373,7 +373,7 @@
                         }
                     ],
                     "description": "The power readings for this circuit.",
-                    "longDescription": "This property shall contain the power sensors for this circuit.  For single-phase circuits, this property shall contain a duplicate copy of the power sensor referenced in the `PowerWatts` property, if present.  For poly-phase circuits, this property should contain multiple power sensor readings used to fully describe the circuit."
+                    "longDescription": "This property shall contain the power sensors for this circuit.  For 3-wire circuits, this property shall contain a duplicate copy of the power sensor referenced in the `PowerWatts` property, if present.  For other circuits, this property should contain multiple power sensor readings used to fully describe the circuit."
                 },
                 "PolyPhaseVoltage": {
                     "anyOf": [
@@ -385,7 +385,7 @@
                         }
                     ],
                     "description": "The voltage readings for this circuit.",
-                    "longDescription": "This property shall contain the voltage sensors for this circuit.  For single-phase circuits, this property shall contain a duplicate copy of the voltage sensor referenced in the `Voltage` property, if present.  For poly-phase circuits, this property should contain multiple voltage sensor readings used to fully describe the circuit."
+                    "longDescription": "This property shall contain the voltage sensors for this circuit.  For 3-wire circuits, this property shall contain a duplicate copy of the voltage sensor referenced in the `Voltage` property, if present.  For other circuits, this property should contain multiple voltage sensor readings used to fully describe the circuit."
                 },
                 "PowerControlLocked": {
                     "description": "Indicates whether power control requests are locked.",
@@ -552,9 +552,9 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The voltage (V) for this single-phase circuit.",
+                    "description": "The voltage (V) for this circuit.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain the voltage, in volt units, for this single-phase circuit.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`.  This property shall not appear in resource instances representing poly-phase circuits."
+                    "longDescription": "This property shall contain the voltage, in volt units, for this circuit.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`.  This property shall not be present if `PhaseWiringType` contains a value that indicates a 4-wire or greater configuration, such as `TwoPhase4Wire`."
                 },
                 "VoltageType": {
                     "anyOf": [
@@ -1171,5 +1171,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2024.1",
-    "title": "#Circuit.v1_8_0.Circuit"
+    "title": "#Circuit.v1_8_1.Circuit"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_1.json b/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_2.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_1.json
rename to redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_2.json
index 82f2fca..b6cde0e 100644
--- a/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_1.json
+++ b/redfish-core/schema/dmtf/json-schema/ComputerSystem.v1_22_2.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_22_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_22_2.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",
@@ -1075,7 +1075,7 @@
                         }
                     ],
                     "description": "The UUID for this system.",
-                    "longDescription": "This property shall contain the universally unique identifier number for this system.  RFC4122 describes methods to create this value.  The value should be considered to be opaque.  Client software should only treat the overall value as a UUID and should not interpret any subfields within the UUID.  If the system supports SMBIOS, the property value should follow the SMBIOS 2.6 and later recommendation for converting the SMBIOS 16-byte UUID structure into the Redfish canonical `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx` string format, so that the property value matches the byte order presented by current OS APIs, such as WMI and dmidecode.",
+                    "longDescription": "This property shall contain the universally unique identifier number for this system.  RFC4122 describes methods to create this value.  The value should be considered to be opaque.  Client software should only treat the overall value as a UUID and should not interpret any subfields within the UUID.  If the system supports SMBIOS, the property value should follow the SMBIOS 2.6 and later recommendation for converting the SMBIOS 16-byte UUID structure into the Redfish canonical `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx` string format, so that the property value matches the byte order presented by current OS APIs, such as WMI and dmidecode.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification.",
                     "readonly": true
                 },
                 "VirtualMedia": {
@@ -2570,5 +2570,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.3",
-    "title": "#ComputerSystem.v1_22_1.ComputerSystem"
+    "title": "#ComputerSystem.v1_22_2.ComputerSystem"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Drive.v1_19_0.json b/redfish-core/schema/dmtf/json-schema/Drive.v1_20_0.json
similarity index 85%
rename from redfish-core/schema/dmtf/json-schema/Drive.v1_19_0.json
rename to redfish-core/schema/dmtf/json-schema/Drive.v1_20_0.json
index 67a62e5..4658b9c 100644
--- a/redfish-core/schema/dmtf/json-schema/Drive.v1_19_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Drive.v1_20_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Drive.v1_19_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Drive.v1_20_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",
@@ -40,6 +40,21 @@
             },
             "type": "object"
         },
+        "ConfigLockOptions": {
+            "enum": [
+                "Unlocked",
+                "Locked",
+                "LockdownUnsupported",
+                "CommandUnsupported"
+            ],
+            "enumDescriptions": {
+                "CommandUnsupported": "The command is not supported, therefore lockdown does not apply.",
+                "LockdownUnsupported": "The command is supported but is not able to be locked.",
+                "Locked": "The command is supported and is currently locked.",
+                "Unlocked": "The command is supported, able to be locked, and is currently unlocked."
+            },
+            "type": "string"
+        },
         "ConfigurationLock": {
             "enum": [
                 "Enabled",
@@ -48,12 +63,12 @@
             ],
             "enumDescriptions": {
                 "Disabled": "In-band configuration requests are not locked.",
-                "Enabled": "In-band configuration requests are locked.  Configuration requests include applying firmware, updating security keys, and other hardware settings.  It does not include managing the volumes or data on the drive.",
+                "Enabled": "In-band configuration requests are locked as specified by `TargetConfigurationLockLevel`.",
                 "Partial": "Some in-band configuration requests are not locked while others are locked.  This value is used for status reporting to indicate that the drive is partially locked and client action is recommended."
             },
             "enumLongDescriptions": {
                 "Disabled": "This value shall indicate in-band configuration requests are not locked.",
-                "Enabled": "This value shall indicate in-band configuration requests are locked.",
+                "Enabled": "This value shall indicate in-band configuration requests are locked as specified by `TargetConfigurationLockLevel`.",
                 "Partial": "This value shall indicate some in-band configuration requests are not locked while others are locked."
             },
             "type": "string"
@@ -128,6 +143,16 @@
                         "null"
                     ]
                 },
+                "BlockSecurityIDEnabled": {
+                    "description": "Indicates if establishment of a TCG-defined security ID (SID) on the drive is blocked.",
+                    "longDescription": "This property shall indicate if establishment of a TCG-defined security ID (SID) on the drive is blocked.  The value `true` shall indicate the TCG-defined 'Block SID' command is sent to the drive during each drive boot sequence.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_20_0"
+                },
                 "BlockSizeBytes": {
                     "description": "The size, in bytes, of the smallest addressable unit, or block.",
                     "longDescription": "This property shall contain the size of the smallest addressable unit of the associated drive.",
@@ -174,7 +199,7 @@
                             "type": "null"
                         }
                     ],
-                    "description": "Indicates whether in-band configuration requests to the drive are locked.",
+                    "description": "Indicates whether in-band configuration requests to the drive are locked.  Other properties, such as `ConfigurationLockState`, contain additional information regarding the status of the configuration lock.",
                     "longDescription": "This property shall indicate whether configuration requests to the drive are locked.  Services shall reject modification requests that contain the value `Partial`.",
                     "readonly": false,
                     "versionAdded": "v1_19_0"
@@ -401,6 +426,19 @@
                     ],
                     "versionAdded": "v1_9_0"
                 },
+                "NVMe": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/NVMe"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "NVMe properties for this drive.",
+                    "longDescription": "This property shall contain NVMe-specific properties of this drive.",
+                    "versionAdded": "v1_20_0"
+                },
                 "Name": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
                     "readonly": true
@@ -574,6 +612,20 @@
                     "longDescription": "This property shall contain the status indicator state for the status indicator associated with this drive.  The `@Redfish.AllowableValues` annotation specifies the valid values for this property.",
                     "readonly": false
                 },
+                "TargetConfigurationLockLevel": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/TargetConfigurationLockLevel"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Indicates the target configuration lock level for the drive based upon the state of the `ConfigurationLock` property.  Other properties, such as `ConfigurationLockState`, contain additional information regarding the status of the configuration lock.",
+                    "longDescription": "This property shall contain the target configuration lock level for the drive.  For NVMe drives, services shall implement the locking requirements specified by SNIA's Swordfish NVMe Model Overview and Mapping Guide.",
+                    "readonly": false,
+                    "versionAdded": "v1_20_0"
+                },
                 "WriteCacheEnabled": {
                     "description": "An indication of whether the drive write cache is enabled.",
                     "longDescription": "This property shall indicate whether the drive write cache is enabled.",
@@ -862,6 +914,133 @@
             },
             "type": "string"
         },
+        "NVMe": {
+            "additionalProperties": false,
+            "description": "NVMe properties for a drive.",
+            "longDescription": "This type shall contain NVMe-specific properties of a drive.",
+            "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": {
+                "ConfigurationLockState": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/NVMeConfigurationLockState"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The configurable features that are able to be locked from in-band usage on an NVMe subsystem and their current lock state.",
+                    "longDescription": "This property shall contain the configurable features that are able to be locked from in-band usage on an NVMe subsystem and their current lock state.",
+                    "versionAdded": "v1_20_0"
+                }
+            },
+            "type": "object"
+        },
+        "NVMeConfigurationLockState": {
+            "additionalProperties": false,
+            "description": "The configurable features that are able to be locked on an NVMe subsystem and their current lock state.",
+            "longDescription": "This type shall contain the configurable features that are able to be locked on an NVMe subsystem and their current lock state.",
+            "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": {
+                "FirmwareCommit": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ConfigLockOptions"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The lock state of the NVMe-defined Firmware Commit command.",
+                    "longDescription": "This property shall contain the lock state of the NVMe-defined Firmware Commit command.",
+                    "readonly": true,
+                    "versionAdded": "v1_20_0"
+                },
+                "FirmwareImageDownload": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ConfigLockOptions"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The lock state of the NVMe-defined Firmware Image Download command.",
+                    "longDescription": "This property shall contain the lock state of the NVMe-defined Firmware Image Download command.",
+                    "readonly": true,
+                    "versionAdded": "v1_20_0"
+                },
+                "Lockdown": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ConfigLockOptions"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The lock state of the NVMe-defined Lockdown command.",
+                    "longDescription": "This property shall contain the lock state of the NVMe-defined Lockdown command.",
+                    "readonly": true,
+                    "versionAdded": "v1_20_0"
+                },
+                "SecuritySend": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ConfigLockOptions"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The lock state of the NVMe-defined Security Send command.",
+                    "longDescription": "This property shall contain the lock state of the NVMe-defined Security Send command.",
+                    "readonly": true,
+                    "versionAdded": "v1_20_0"
+                },
+                "VPDWrite": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ConfigLockOptions"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The lock state of the NVMe-MI-defined VPD Write command.",
+                    "longDescription": "This property shall contain the lock state of the NVMe-MI-defined VPD Write command.",
+                    "readonly": true,
+                    "versionAdded": "v1_20_0"
+                }
+            },
+            "type": "object"
+        },
         "OemActions": {
             "additionalProperties": true,
             "description": "The available OEM-specific actions for this resource.",
@@ -1094,10 +1273,19 @@
                 "Rebuild": "The drive is being rebuilt."
             },
             "type": "string"
+        },
+        "TargetConfigurationLockLevel": {
+            "enum": [
+                "Baseline"
+            ],
+            "enumDescriptions": {
+                "Baseline": "The standard configuration lock level, corresponding to applying firmware, updating security keys, and modifying other hardware settings.  It does not include managing the volumes or data on the drive."
+            },
+            "type": "string"
         }
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#Drive.v1_19_0.Drive"
+    "release": "2024.2",
+    "title": "#Drive.v1_20_0.Drive"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_1.json b/redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_2.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_1.json
rename to redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_2.json
index 9893b2d..ea65bcc 100644
--- a/redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_1.json
+++ b/redfish-core/schema/dmtf/json-schema/EthernetInterface.v1_12_2.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/EthernetInterface.v1_12_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EthernetInterface.v1_12_2.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",
@@ -372,7 +372,7 @@
                 },
                 "HostName": {
                     "description": "The DNS host name, without any domain information.",
-                    "longDescription": "This property shall contain the DNS host name for this interface.  Modifying this property may modify the `HostName` in one or more `EthernetInterface` resources that belong to the same system, manager, or other device.  If this interface is subordinate to a `ComputerSystem` resource, modifying this property may modify the `HostName` of the `ComputerSystem` resource that contains this interface.  If this interface is subordinate to a `Manager` resource, modifying this property may modify the `HostName` of the `ManagerNetworkProtocol` resource of the `Manager` resource that contains this interface.",
+                    "longDescription": "This property shall contain the DNS host name for this interface.  Modifying this property may modify the `HostName` in one or more `EthernetInterface` resources that belong to the same system, manager, or other device.  If this interface is subordinate to a `ComputerSystem` resource, modifying this property may modify the `HostName` of the `ComputerSystem` resource that contains this interface.  If this interface is subordinate to a `Manager` resource, modifying this property may modify the `HostName` of the `ManagerNetworkProtocol` resource of the `Manager` resource that contains this interface.  Services should ignore this property in modification requests if `FQDN` is also provided in the same request.",
                     "readonly": false,
                     "type": [
                         "string",
@@ -973,5 +973,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.3",
-    "title": "#EthernetInterface.v1_12_1.EthernetInterface"
+    "title": "#EthernetInterface.v1_12_2.EthernetInterface"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_1.json b/redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_2.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_1.json
rename to redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_2.json
index d0e064a..0ae4c39 100644
--- a/redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_1.json
+++ b/redfish-core/schema/dmtf/json-schema/LogEntry.v1_16_2.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/LogEntry.v1_16_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/LogEntry.v1_16_2.json",
     "$ref": "#/definitions/LogEntry",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -160,7 +160,7 @@
                     "items": {
                         "$ref": "http://redfish.dmtf.org/schemas/v1/LogEntry.json#/definitions/LogEntry"
                     },
-                    "longDescription": "This property shall contain an array of links to resources of type `LogEntry` in this or other log services that are related to this log entry.",
+                    "longDescription": "This property shall contain an array of links to resources of type `LogEntry` in this or other log services that are related to this log entry.  This property should be used to link a log entry indicating the resolution of a condition with a log entry for the initial condition.",
                     "readonly": true,
                     "type": "array",
                     "versionAdded": "v1_12_0"
@@ -884,5 +884,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.3",
-    "title": "#LogEntry.v1_16_1.LogEntry"
+    "title": "#LogEntry.v1_16_2.LogEntry"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/MemoryRegion.v1_0_2.json b/redfish-core/schema/dmtf/json-schema/MemoryRegion.v1_0_3.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/MemoryRegion.v1_0_2.json
rename to redfish-core/schema/dmtf/json-schema/MemoryRegion.v1_0_3.json
index 8bfd7ef..124e92a 100644
--- a/redfish-core/schema/dmtf/json-schema/MemoryRegion.v1_0_2.json
+++ b/redfish-core/schema/dmtf/json-schema/MemoryRegion.v1_0_3.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/MemoryRegion.v1_0_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MemoryRegion.v1_0_3.json",
     "$ref": "#/definitions/MemoryRegion",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -109,7 +109,7 @@
                     ]
                 },
                 "Tag": {
-                    "description": "The user-assigned tag of this memory extent.",
+                    "description": "The tag of this memory extent.",
                     "longDescription": "This property shall contain an opaque context attached to each extent to track usage of each extent or map extent to specific processes, transactions, or workloads on the host.",
                     "readonly": true,
                     "type": "string"
@@ -336,5 +336,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2023.2",
-    "title": "#MemoryRegion.v1_0_2.MemoryRegion"
+    "title": "#MemoryRegion.v1_0_3.MemoryRegion"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/MetricReport.v1_5_1.json b/redfish-core/schema/dmtf/json-schema/MetricReport.v1_5_2.json
similarity index 96%
rename from redfish-core/schema/dmtf/json-schema/MetricReport.v1_5_1.json
rename to redfish-core/schema/dmtf/json-schema/MetricReport.v1_5_2.json
index 4b884cd..85983ae 100644
--- a/redfish-core/schema/dmtf/json-schema/MetricReport.v1_5_1.json
+++ b/redfish-core/schema/dmtf/json-schema/MetricReport.v1_5_2.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/MetricReport.v1_5_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MetricReport.v1_5_2.json",
     "$ref": "#/definitions/MetricReport",
     "$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",
@@ -188,7 +188,7 @@
                 },
                 "MetricValue": {
                     "description": "The metric value, as a string.",
-                    "longDescription": "This property shall contain the metric value, as a string.",
+                    "longDescription": "This property shall contain the metric value, as a string.  For numeric metrics, the service shall convert the number to a string representation of the number.  For array metrics, the service shall convert the array to an RFC8259-defined JSON string.  For boolean metrics, this property shall contain the strings `true` or `false`.  If the metric value is `null`, this property shall contain `null`.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -239,5 +239,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2022.2",
-    "title": "#MetricReport.v1_5_1.MetricReport"
+    "title": "#MetricReport.v1_5_2.MetricReport"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Outlet.v1_4_3.json b/redfish-core/schema/dmtf/json-schema/Outlet.v1_4_4.json
similarity index 96%
rename from redfish-core/schema/dmtf/json-schema/Outlet.v1_4_3.json
rename to redfish-core/schema/dmtf/json-schema/Outlet.v1_4_4.json
index 0d7f752..05f86e0 100644
--- a/redfish-core/schema/dmtf/json-schema/Outlet.v1_4_3.json
+++ b/redfish-core/schema/dmtf/json-schema/Outlet.v1_4_4.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Outlet.v1_4_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Outlet.v1_4_4.json",
     "$ref": "#/definitions/Outlet",
     "$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",
@@ -263,9 +263,9 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The current (A) for this single-phase outlet.",
+                    "description": "The current (A) for this outlet.",
                     "excerptCopy": "SensorCurrentExcerpt",
-                    "longDescription": "This property shall contain the current, in ampere units, for this single-phase outlet.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`.  This property shall not appear in resource instances representing poly-phase outlets."
+                    "longDescription": "This property shall contain the current, in ampere units, for this outlet.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Current`.  This property shall not be present if `PhaseWiringType` contains a value that indicates a 4-wire or greater configuration, such as `TwoPhase4Wire`."
                 },
                 "Description": {
                     "anyOf": [
@@ -422,7 +422,7 @@
                         }
                     ],
                     "description": "The current readings for this outlet.",
-                    "longDescription": "This property shall contain the current readings for this outlet.  For single-phase outlets, this property shall contain a duplicate copy of the current sensor referenced in the `CurrentAmps` property, if present.  For poly-phase outlets, this property should contain multiple current sensor readings used to fully describe the outlet."
+                    "longDescription": "This property shall contain the current readings for this outlet.  For 3-wire outlets, this property shall contain a duplicate copy of the current sensor referenced in the `CurrentAmps` property, if present.  For other outlets, this property should contain multiple current sensor readings used to fully describe the outlet."
                 },
                 "PolyPhaseVoltage": {
                     "anyOf": [
@@ -434,7 +434,7 @@
                         }
                     ],
                     "description": "The voltage readings for this outlet.",
-                    "longDescription": "This property shall contain the voltage readings for this outlet.  For single-phase outlets, this property shall contain a duplicate copy of the voltage sensor referenced in the `Voltage` property, if present.  For poly-phase outlets, this property should contain multiple voltage sensor readings used to fully describe the outlet."
+                    "longDescription": "This property shall contain the voltage readings for this outlet.  For 3-wire outlets, this property shall contain a duplicate copy of the voltage sensor referenced in the `Voltage` property, if present.  For other outlets, this property should contain multiple voltage sensor readings used to fully describe the outlet."
                 },
                 "PowerControlLocked": {
                     "description": "Indicates whether power control requests are locked.",
@@ -573,9 +573,9 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The voltage (V) for this single-phase outlet.",
+                    "description": "The voltage (V) for this outlet.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain the voltage, in volt units, for this single-phase outlet.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`.  This property shall not appear in resource instances representing poly-phase outlets."
+                    "longDescription": "This property shall contain the voltage, in volt units, for this outlet.  The value of the `DataSourceUri` property, if present, shall reference a resource of type `Sensor` with the `ReadingType` property containing the value `Voltage`.  This property shall not be present if `PhaseWiringType` contains a value that indicates a 4-wire or greater configuration, such as `TwoPhase4Wire`."
                 },
                 "VoltageType": {
                     "anyOf": [
@@ -784,5 +784,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2021.4",
-    "title": "#Outlet.v1_4_3.Outlet"
+    "title": "#Outlet.v1_4_4.Outlet"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_14_0.json b/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_15_0.json
similarity index 96%
rename from redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_14_0.json
rename to redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_15_0.json
index 2f61de9..7609080 100644
--- a/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_14_0.json
+++ b/redfish-core/schema/dmtf/json-schema/PCIeDevice.v1_15_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_14_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_15_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",
@@ -798,6 +798,26 @@
                 }
             },
             "properties": {
+                "BadDLLPCount": {
+                    "description": "The total number of Bad DLLPs issued on the PCIe link by the receiver.",
+                    "longDescription": "This property shall contain the total number of Bad DLLPs issued on the PCIe link by the receiver.  A Bad DLLP in the context of PCIe communication is a packet that has encountered errors at the data link layer.  When a DLLP is considered bad, it means it has been corrupted or is incorrectly formatted, potentially due to transmission errors, hardware failures, or other issues that affect its integrity.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_15_0"
+                },
+                "BadTLPCount": {
+                    "description": "The total number of Bad TLPs issued on the PCIe link by the receiver.",
+                    "longDescription": "This property shall contain the total number of Bad TLPs issued on the PCIe link by the receiver.  A Bad TLP in the context of PCIe communication is a packet that cannot be properly processed due to errors at the transaction layer.  These errors could include corrupted data, incorrect packet formatting, invalid header information, or a mismatched checksum.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_15_0"
+                },
                 "CorrectableErrorCount": {
                     "description": "The total number of PCIe correctable errors for this device.",
                     "longDescription": "This property shall contain the total number of PCIe correctable errors for this device.",
@@ -1088,6 +1108,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#PCIeDevice.v1_14_0.PCIeDevice"
+    "release": "2024.2",
+    "title": "#PCIeDevice.v1_15_0.PCIeDevice"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/PhysicalContext.json b/redfish-core/schema/dmtf/json-schema/PhysicalContext.json
index a1267cf..cc43e17 100644
--- a/redfish-core/schema/dmtf/json-schema/PhysicalContext.json
+++ b/redfish-core/schema/dmtf/json-schema/PhysicalContext.json
@@ -71,7 +71,11 @@
                 "Board",
                 "Transceiver",
                 "Battery",
-                "Pump"
+                "Pump",
+                "Filter",
+                "Reservoir",
+                "Switch",
+                "Manager"
             ],
             "enumDescriptions": {
                 "ACInput": "An AC input.",
@@ -95,6 +99,7 @@
                 "ExpansionBay": "Within an expansion bay.",
                 "FPGA": "An FPGA.",
                 "Fan": "A fan.",
+                "Filter": "A filter.",
                 "Front": "The front of the chassis.",
                 "GPU": "A graphics processor (GPU).",
                 "GPUSubsystem": "The entire graphics processor (GPU) subsystem.",
@@ -102,6 +107,7 @@
                 "LiquidInlet": "The liquid inlet point of the chassis.",
                 "LiquidOutlet": "The liquid outlet point of the chassis.",
                 "Lower": "The lower portion of the chassis.",
+                "Manager": "A management controller, such as a BMC (baseboard management controller).",
                 "Memory": "A memory device.",
                 "MemorySubsystem": "The entire memory subsystem.",
                 "Motor": "A motor.",
@@ -112,9 +118,11 @@
                 "PowerSupplyBay": "Within a power supply bay.",
                 "Pump": "A pump.",
                 "Rectifier": "A rectifier device.",
+                "Reservoir": "A reservoir.",
                 "Room": "The room.",
                 "StorageBay": "Within a storage bay.",
                 "StorageDevice": "A storage device.",
+                "Switch": "A switch device.",
                 "SystemBoard": "The system board (PCB).",
                 "Transceiver": "A transceiver.",
                 "Transformer": "A transformer.",
@@ -142,15 +150,19 @@
                 "DCBus": "2018.3",
                 "FPGA": "2018.3",
                 "Fan": "2017.2",
+                "Filter": "2024.2",
                 "GPUSubsystem": "2018.3",
                 "LiquidInlet": "2017.3",
                 "LiquidOutlet": "2017.3",
+                "Manager": "2024.2",
                 "Memory": "2017.1",
                 "MemorySubsystem": "2018.3",
                 "Motor": "2018.3",
                 "PowerSubsystem": "2019.1",
                 "Pump": "2021.3",
                 "Rectifier": "2019.1",
+                "Reservoir": "2024.2",
+                "Switch": "2024.2",
                 "Transceiver": "2021.1",
                 "Transformer": "2018.3",
                 "TrustedModule": "2020.4"
diff --git a/redfish-core/schema/dmtf/json-schema/Port.v1_12_0.json b/redfish-core/schema/dmtf/json-schema/Port.v1_13_0.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Port.v1_12_0.json
rename to redfish-core/schema/dmtf/json-schema/Port.v1_13_0.json
index 75b8152..f653285 100644
--- a/redfish-core/schema/dmtf/json-schema/Port.v1_12_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Port.v1_13_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Port.v1_12_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Port.v1_13_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",
@@ -2156,6 +2156,27 @@
                     "longDescription": "This property shall contain the SFP device type currently attached to this port.",
                     "readonly": true,
                     "versionAdded": "v1_4_0"
+                },
+                "VendorOUI": {
+                    "description": "The IEEE OUI of the vendor of this SFP.",
+                    "longDescription": "This property shall contain the IEEE organizationally unique identifier (OUI) of the vendor of this SFP.",
+                    "pattern": "^([0-9A-Fa-f]{2}-){2}([0-9A-Fa-f]{2})$",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_13_0"
+                },
+                "Version": {
+                    "description": "The hardware version of this SFP.",
+                    "longDescription": "This property shall contain the hardware version of this SFP as determined by the vendor or supplier.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_13_0"
                 }
             },
             "type": "object"
@@ -2211,6 +2232,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#Port.v1_12_0.Port"
+    "release": "2024.2",
+    "title": "#Port.v1_13_0.Port"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Processor.v1_20_0.json b/redfish-core/schema/dmtf/json-schema/Processor.v1_20_1.json
similarity index 98%
rename from redfish-core/schema/dmtf/json-schema/Processor.v1_20_0.json
rename to redfish-core/schema/dmtf/json-schema/Processor.v1_20_1.json
index 1da995b..8cdfe16 100644
--- a/redfish-core/schema/dmtf/json-schema/Processor.v1_20_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Processor.v1_20_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Processor.v1_20_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Processor.v1_20_1.json",
     "$ref": "#/definitions/Processor",
     "$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",
@@ -898,7 +898,7 @@
                 "ProcessorId": {
                     "$ref": "#/definitions/ProcessorId",
                     "description": "The identification information for this processor.",
-                    "longDescription": "This object shall contain identification information for this processor."
+                    "longDescription": "This object shall contain identification information for this processor.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification."
                 },
                 "ProcessorIndex": {
                     "description": "The logical index of this processor within the system.",
@@ -1170,7 +1170,7 @@
             "properties": {
                 "EffectiveFamily": {
                     "description": "The effective family for this processor.",
-                    "longDescription": "This property shall contain the effective family information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\\d+$`.",
+                    "longDescription": "This property shall contain the effective family information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\\d+$`.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1179,7 +1179,7 @@
                 },
                 "EffectiveModel": {
                     "description": "The effective model for this processor.",
-                    "longDescription": "This property shall contain the effective model information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\\d+$`.",
+                    "longDescription": "This property shall contain the effective model information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\\d+$`.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1188,7 +1188,7 @@
                 },
                 "IdentificationRegisters": {
                     "description": "The raw manufacturer-provided processor identification registers for this processor.",
-                    "longDescription": "This property shall contain the raw manufacturer-provided processor-specific identification registers of this processor's features.",
+                    "longDescription": "This property shall contain the raw manufacturer-provided processor-specific identification registers of this processor's features.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification.",
                     "pattern": "^0x[0-9A-Fa-f]+$",
                     "readonly": true,
                     "type": [
@@ -1198,7 +1198,7 @@
                 },
                 "MicrocodeInfo": {
                     "description": "The microcode information for this processor.",
-                    "longDescription": "This property shall contain the microcode information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\\d+$`.",
+                    "longDescription": "This property shall contain the microcode information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\\d+$`.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1217,7 +1217,7 @@
                 },
                 "Step": {
                     "description": "The step value for this processor.",
-                    "longDescription": "This property shall contain the step or revision information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\\d+$`.",
+                    "longDescription": "This property shall contain the step or revision information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\\d+$`.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1226,7 +1226,7 @@
                 },
                 "VendorId": {
                     "description": "The vendor identification for this processor.",
-                    "longDescription": "This property shall contain the vendor identification information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\\d+$`.",
+                    "longDescription": "This property shall contain the vendor identification information as provided by the manufacturer of this processor.  If this property represents raw register data, as determined by the value of the `ProcessorArchitecture` property, the service shall encode the value as a hex-encoded string following the regular expression pattern `^0x[0-9A-Fa-f]+$` or a decimal-encoded string following the regular expression pattern `^\\d+$`.  For additional property requirements, see the corresponding definition in the Redfish Data Model Specification.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1590,5 +1590,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2024.1",
-    "title": "#Processor.v1_20_0.Processor"
+    "title": "#Processor.v1_20_1.Processor"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Resource.v1_19_0.json b/redfish-core/schema/dmtf/json-schema/Resource.v1_19_1.json
similarity index 99%
rename from redfish-core/schema/dmtf/json-schema/Resource.v1_19_0.json
rename to redfish-core/schema/dmtf/json-schema/Resource.v1_19_1.json
index 1468893..4f7890c 100644
--- a/redfish-core/schema/dmtf/json-schema/Resource.v1_19_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Resource.v1_19_1.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_19_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_19_1.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": {
@@ -1175,5 +1175,5 @@
     "language": "en",
     "owningEntity": "DMTF",
     "release": "2024.1",
-    "title": "#Resource.v1_19_0"
+    "title": "#Resource.v1_19_1"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Sensor.v1_9_0.json b/redfish-core/schema/dmtf/json-schema/Sensor.v1_10_0.json
similarity index 97%
rename from redfish-core/schema/dmtf/json-schema/Sensor.v1_9_0.json
rename to redfish-core/schema/dmtf/json-schema/Sensor.v1_10_0.json
index b826282..e456216 100644
--- a/redfish-core/schema/dmtf/json-schema/Sensor.v1_9_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Sensor.v1_10_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_9_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_10_0.json",
     "$ref": "#/definitions/Sensor",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -472,6 +472,16 @@
                     "longDescription": "This property shall represent the combination of current-carrying conductors that distribute power.",
                     "readonly": true
                 },
+                "Enabled": {
+                    "description": "Indicates whether the sensor is enabled and provides a reading.",
+                    "longDescription": "This property shall indicate whether the sensor is enabled and provides a `Reading`.  The value `true` shall indicate the sensor is enabled and returns the `Reading` property with a valid value.  The value `false` shall indicate the sensor is disabled, and shall not return the `Reading` property.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_10_0"
+                },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
@@ -720,7 +730,7 @@
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the sensor value.",
+                    "longDescription": "This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1022,7 +1032,7 @@
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the sensor value.",
+                    "longDescription": "This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1077,7 +1087,7 @@
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the sensor value.",
+                    "longDescription": "This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1169,7 +1179,7 @@
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the sensor value.",
+                    "longDescription": "This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1224,7 +1234,7 @@
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the sensor value.",
+                    "longDescription": "This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1308,7 +1318,7 @@
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the sensor value.",
+                    "longDescription": "This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1364,7 +1374,7 @@
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the sensor value.",
+                    "longDescription": "This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1495,7 +1505,7 @@
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the sensor value.",
+                    "longDescription": "This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1586,7 +1596,7 @@
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the sensor value.",
+                    "longDescription": "This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1630,7 +1640,7 @@
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the sensor value.",
+                    "longDescription": "This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1697,7 +1707,7 @@
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the sensor value.",
+                    "longDescription": "This property shall contain the sensor value.  This property shall not be returned if the `Enabled` property is supported and contains `false`.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -1898,6 +1908,6 @@
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#Sensor.v1_9_0.Sensor"
+    "release": "2024.2",
+    "title": "#Sensor.v1_10_0.Sensor"
 }
\ No newline at end of file
diff --git a/redfish-core/schema/dmtf/json-schema/Storage.v1_16_0.json b/redfish-core/schema/dmtf/json-schema/Storage.v1_17_0.json
similarity index 84%
rename from redfish-core/schema/dmtf/json-schema/Storage.v1_16_0.json
rename to redfish-core/schema/dmtf/json-schema/Storage.v1_17_0.json
index 12e5eeb..be6c3a8 100644
--- a/redfish-core/schema/dmtf/json-schema/Storage.v1_16_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Storage.v1_17_0.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_16_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_17_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",
@@ -29,6 +29,9 @@
                 "#Storage.ResetToDefaults": {
                     "$ref": "#/definitions/ResetToDefaults"
                 },
+                "#Storage.SetControllerPassword": {
+                    "$ref": "#/definitions/SetControllerPassword"
+                },
                 "#Storage.SetEncryptionKey": {
                     "$ref": "#/definitions/SetEncryptionKey"
                 },
@@ -110,6 +113,21 @@
             ],
             "type": "object"
         },
+        "ConfigLockOptions": {
+            "enum": [
+                "Unlocked",
+                "Locked",
+                "LockdownUnsupported",
+                "CommandUnsupported"
+            ],
+            "enumDescriptions": {
+                "CommandUnsupported": "The command is not supported, therefore lockdown does not apply.",
+                "LockdownUnsupported": "The command is supported but is not able to be locked.",
+                "Locked": "The command is supported and is currently locked.",
+                "Unlocked": "The command is supported, able to be locked, and is currently unlocked."
+            },
+            "type": "string"
+        },
         "ConfigurationLock": {
             "enum": [
                 "Enabled",
@@ -118,12 +136,12 @@
             ],
             "enumDescriptions": {
                 "Disabled": "In-band configuration requests are not locked.",
-                "Enabled": "In-band configuration requests are locked.  Configuration requests include applying firmware, updating security keys, and other hardware settings.  It does not include managing the volumes or data within the storage subsystem.",
+                "Enabled": "In-band configuration requests are locked as specified by `TargetConfigurationLockLevel`.",
                 "Partial": "Some in-band configuration requests are not locked while others are locked.  This value is used for status reporting to indicate that the storage subsystem is partially locked and client action is recommended."
             },
             "enumLongDescriptions": {
                 "Disabled": "This value shall indicate in-band configuration requests are not locked.",
-                "Enabled": "This value shall indicate in-band configuration requests are locked.",
+                "Enabled": "This value shall indicate in-band configuration requests are locked as specified by `TargetConfigurationLockLevel`.",
                 "Partial": "This value shall indicate some in-band configuration requests are not locked while others are locked."
             },
             "type": "string"
@@ -132,13 +150,24 @@
             "enum": [
                 "Disabled",
                 "UseExternalKey",
-                "UseLocalKey"
+                "UseLocalKey",
+                "PasswordOnly",
+                "PasswordWithExternalKey",
+                "PasswordWithLocalKey"
             ],
             "enumDescriptions": {
                 "Disabled": "Encryption is disabled on the storage subsystem.",
+                "PasswordOnly": "The storage subsystem uses a password, but no keys for encryption.",
+                "PasswordWithExternalKey": "The storage subsystem uses a password and one or more external keys for encryption.",
+                "PasswordWithLocalKey": "The storage subsystem uses a password and a local key for encryption.",
                 "UseExternalKey": "The storage subsystem uses one or more external keys for encryption.",
                 "UseLocalKey": "The storage subsystem uses a local key for encryption."
             },
+            "enumVersionAdded": {
+                "PasswordOnly": "v1_17_0",
+                "PasswordWithExternalKey": "v1_17_0",
+                "PasswordWithLocalKey": "v1_17_0"
+            },
             "type": "string"
         },
         "HotspareActivationPolicy": {
@@ -239,6 +268,98 @@
             },
             "type": "object"
         },
+        "NVMeConfigurationLockState": {
+            "additionalProperties": false,
+            "description": "The configurable features that are able to be locked on an NVMe subsystem and their current lock state.",
+            "longDescription": "This type shall contain the configurable features that are able to be locked on an NVMe subsystem and their current lock state.",
+            "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": {
+                "FirmwareCommit": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ConfigLockOptions"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The lock state of the NVMe-defined Firmware Commit command.",
+                    "longDescription": "This property shall contain the lock state of the NVMe-defined Firmware Commit command.",
+                    "readonly": true,
+                    "versionAdded": "v1_17_0"
+                },
+                "FirmwareImageDownload": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ConfigLockOptions"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The lock state of the NVMe-defined Firmware Image Download command.",
+                    "longDescription": "This property shall contain the lock state of the NVMe-defined Firmware Image Download command.",
+                    "readonly": true,
+                    "versionAdded": "v1_17_0"
+                },
+                "Lockdown": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ConfigLockOptions"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The lock state of the NVMe-defined Lockdown command.",
+                    "longDescription": "This property shall contain the lock state of the NVMe-defined Lockdown command.",
+                    "readonly": true,
+                    "versionAdded": "v1_17_0"
+                },
+                "SecuritySend": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ConfigLockOptions"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The lock state of the NVMe-defined Security Send command.",
+                    "longDescription": "This property shall contain the lock state of the NVMe-defined Security Send command.",
+                    "readonly": true,
+                    "versionAdded": "v1_17_0"
+                },
+                "VPDWrite": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ConfigLockOptions"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The lock state of the NVMe-MI-defined VPD Write command.",
+                    "longDescription": "This property shall contain the lock state of the NVMe-MI-defined VPD Write command.",
+                    "readonly": true,
+                    "versionAdded": "v1_17_0"
+                }
+            },
+            "type": "object"
+        },
         "NVMeSubsystemProperties": {
             "additionalProperties": false,
             "description": "Information specific to NVMe Subsystems.",
@@ -258,6 +379,19 @@
                 }
             },
             "properties": {
+                "ConfigurationLockState": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/NVMeConfigurationLockState"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The configurable features that are able to be locked from in-band usage on an NVMe subsystem and their current lock state.",
+                    "longDescription": "This property shall contain the configurable features that are able to be locked from in-band usage on an NVMe subsystem and their current lock state.",
+                    "versionAdded": "v1_17_0"
+                },
                 "MaxNamespacesSupported": {
                     "description": "The maximum number of namespace attachments supported by this NVMe Subsystem.",
                     "longDescription": "This property shall contain the maximum number of namespace attachments supported by this NVMe Subsystem.  If no maximum is specified, this property should not be implemented.",
@@ -444,14 +578,64 @@
             },
             "type": "string"
         },
+        "SetControllerPassword": {
+            "additionalProperties": false,
+            "description": "This action sets the controller boot password for a host-based storage controller.",
+            "longDescription": "This action shall set the controller boot password for a host-based storage controller.",
+            "parameters": {
+                "CurrentPassword": {
+                    "description": "The current controller password.  This parameter is not needed if the controller does not currently have a password.",
+                    "longDescription": "This parameter shall contain the current controller password.  Services may reject the action request if this parameter is not provided or the value supplied does not match the current password.",
+                    "type": "string"
+                },
+                "NewPassword": {
+                    "description": "The new password to set for the controller.",
+                    "longDescription": "This parameter shall contain the new password to set for the controller.",
+                    "requiredParameter": true,
+                    "type": "string"
+                },
+                "SecurityKey": {
+                    "description": "The security key for the controller.  This parameter is not needed if the controller does not have a security key.",
+                    "longDescription": "This parameter shall contain the controller security key.  Services may reject the action request if this parameter is not provided or the value provided does not match the security key for the controller.",
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_17_0"
+        },
         "SetEncryptionKey": {
             "additionalProperties": false,
             "description": "This action sets the local encryption key for the storage subsystem.",
             "longDescription": "This action shall set the local encryption key for the storage subsystem.",
             "parameters": {
                 "CurrentEncryptionKey": {
-                    "description": "The current local encryption key on the storage subsystem.",
-                    "longDescription": "This parameter shall contain the current local encryption key on the storage subsystem.  Services may reject the action request if this parameter is not provided.",
+                    "description": "The current local encryption key on the storage subsystem.  This parameter is not needed if the controller does not currently have an encryption key.",
+                    "longDescription": "This parameter shall contain the current local encryption key on the storage subsystem.  Services may reject the action request if this parameter is not provided or the value supplied does not match the current encryption key.",
                     "type": "string",
                     "versionAdded": "v1_14_0"
                 },
@@ -554,7 +738,7 @@
                             "type": "null"
                         }
                     ],
-                    "description": "Indicates whether in-band configuration requests to the storage subsystem are locked.",
+                    "description": "Indicates whether in-band configuration requests to the storage subsystem are locked.  Other properties, such as `ConfigurationLockState`, contain additional information regarding the status of the configuration lock.",
                     "longDescription": "This property shall indicate whether configuration requests to the storage subsystem are locked.  Services shall reject modification requests that contain the value `Partial`.  Modifying the value of this property may affect the `ConfigurationLock` property in `Drive` resources referenced by the `Drives` property.",
                     "readonly": false,
                     "versionAdded": "v1_16_0"
@@ -743,6 +927,20 @@
                     "readonly": true,
                     "versionAdded": "v1_8_0"
                 },
+                "TargetConfigurationLockLevel": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/TargetConfigurationLockLevel"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Indicates the target configuration lock level for the drive based upon the state of the `ConfigurationLock` property.  Other properties, such as `ConfigurationLockState`, contain additional information regarding the status of the configuration lock.",
+                    "longDescription": "This property shall contain the target configuration lock level for the drive.  For NVMe subsystems, services shall implement the locking requirements specified by SNIA's Swordfish NVMe Model Overview and Mapping Guide.",
+                    "readonly": false,
+                    "versionAdded": "v1_17_0"
+                },
                 "Volumes": {
                     "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/VolumeCollection.json#/definitions/VolumeCollection",
                     "description": "The set of volumes that the storage controllers produce.",
@@ -1111,10 +1309,19 @@
             },
             "properties": {},
             "type": "object"
+        },
+        "TargetConfigurationLockLevel": {
+            "enum": [
+                "Baseline"
+            ],
+            "enumDescriptions": {
+                "Baseline": "The standard configuration lock level, corresponding to applying firmware, updating security keys, and modifying other hardware settings.  It does not include managing the volumes or data within the storage subsystem."
+            },
+            "type": "string"
         }
     },
     "language": "en",
     "owningEntity": "DMTF",
-    "release": "2024.1",
-    "title": "#Storage.v1_16_0.Storage"
+    "release": "2024.2",
+    "title": "#Storage.v1_17_0.Storage"
 }
\ 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_0.json
index 32b1b17..9803ce7 100644
--- a/redfish-core/schema/dmtf/json-schema/Volume.v1_10_0.json
+++ b/redfish-core/schema/dmtf/json-schema/Volume.v1_10_0.json
@@ -2,8 +2,38 @@
     "$id": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.v1_10_0.json",
     "$ref": "#/definitions/Volume",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2015-2023 Storage Networking Industry Association (SNIA), USA. All rights reserved.",
+    "copyright": "Copyright 2015-2024 Storage Networking Industry Association (SNIA), USA. All rights reserved.",
     "definitions": {
+        "ALUA": {
+            "additionalProperties": false,
+            "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": {
+                "ANAGroupId": {
+                    "description": "The ANA group id for this volume.",
+                    "longDescription": "This shall contain the ANA group id for this volume.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "versionAdded": "v1_10_0"
+                }
+            },
+            "type": "object"
+        },
         "Actions": {
             "additionalProperties": false,
             "patternProperties": {
@@ -552,6 +582,19 @@
                     "readonly": true,
                     "versionAdded": "v1_4_0"
                 },
+                "ProvidingStoragePool": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StoragePool.json#/definitions/StoragePool"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The StoragePool resource that provides this volume resource.",
+                    "longDescription": "This property shall contain a pointer to the StoragePool resource that provides this volume resource.",
+                    "versionAdded": "v1_10_0"
+                },
                 "ServerEndpoints": {
                     "description": "An array of references to the server Endpoints associated with this volume.",
                     "items": {
@@ -749,6 +792,26 @@
                     "units": "By",
                     "versionAdded": "v1_5_0"
                 },
+                "SupportsIOPerformanceHints": {
+                    "description": "Indicates whether the namespace supports IO performance hints.",
+                    "longDescription": "This property shall indicate whether the namespace supports IO performance hints.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_10_0"
+                },
+                "SupportsMultipleNamespaceAttachments": {
+                    "description": "Indicates whether the namespace may be attached to two or more controllers.",
+                    "longDescription": "This property shall indicate whether the namespace may be attached to two or more controllers.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_10_0"
+                },
                 "Type": {
                     "anyOf": [
                         {
@@ -1148,6 +1211,19 @@
                 "@odata.type": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
                 },
+                "ALUA": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ALUA"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "ALUA properties for this volume.",
+                    "longDescription": "This shall identify the ALUA properties for this volume.",
+                    "versionAdded": "v1_10_0"
+                },
                 "AccessCapabilities": {
                     "description": "Supported IO access capabilities.",
                     "items": {
@@ -1301,9 +1377,11 @@
                 },
                 "IOStatistics": {
                     "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/IOStatistics.v1_0_1.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.",
-                    "versionAdded": "v1_2_0"
+                    "versionAdded": "v1_2_0",
+                    "versionDeprecated": "v1_10_0"
                 },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
diff --git a/redfish-core/schema/dmtf/json-schema/VolumeCollection.json b/redfish-core/schema/dmtf/json-schema/VolumeCollection.json
index 9ee0661..5bebf3d 100644
--- a/redfish-core/schema/dmtf/json-schema/VolumeCollection.json
+++ b/redfish-core/schema/dmtf/json-schema/VolumeCollection.json
@@ -2,7 +2,7 @@
     "$id": "http://redfish.dmtf.org/schemas/swordfish/v1/VolumeCollection.json",
     "$ref": "#/definitions/VolumeCollection",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2015-2023 Storage Networking Industry Association (SNIA), USA. All rights reserved.",
+    "copyright": "Copyright 2015-2024 Storage Networking Industry Association (SNIA), USA. All rights reserved.",
     "definitions": {
         "VolumeCollection": {
             "anyOf": [
diff --git a/redfish-core/schema/dmtf/json-schema/info.json b/redfish-core/schema/dmtf/json-schema/info.json
deleted file mode 100644
index 236471a..0000000
--- a/redfish-core/schema/dmtf/json-schema/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "version": "2024.1",
-    "date": "05-16-2024"
-}
diff --git a/redfish-core/schema/dmtf/json-schema/redfish-payload-annotations-v1.json b/redfish-core/schema/dmtf/json-schema/redfish-payload-annotations-v1.json
index 18c7245..a93ea79 100644
--- a/redfish-core/schema/dmtf/json-schema/redfish-payload-annotations-v1.json
+++ b/redfish-core/schema/dmtf/json-schema/redfish-payload-annotations-v1.json
@@ -1,7 +1,7 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/redfish-payload-annotations.v1_2_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/redfish-payload-annotations.v1_2_3.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2023 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "properties": {
         "@Redfish.ActionInfo": {
             "description": "The term can be applied to an action to specify a URI to an ActionInfo resource that describes the parameters supported by this instance of the action.",
@@ -134,7 +134,7 @@
             "readonly": true
         },
         "^([a-zA-Z_][a-zA-Z0-9_]*)?@Redfish.AllowableNumbers$": {
-            "description": "The term specifies the numeric values or duration values, inclusive ranges of values, and incremental step values for a read-write property that are supported by the service, as defined in the 'Allowable values for numbers and durations' clause of the Redfish Specification.",
+            "description": "The term specifies the numeric values or duration values, inclusive ranges of values, and incremental step values for an action parameter or a read-write property that are supported by the service, as defined in the 'Allowable values for numbers and durations' clause of the Redfish Specification.",
             "type": "array",
             "items": {
                 "type": "string"
@@ -142,7 +142,7 @@
             "readonly": true
         },
         "^([a-zA-Z_][a-zA-Z0-9_]*)?@Redfish.AllowablePattern$": {
-            "description": "The term specifies a regular expression that describes the allowable values for a read-write property as supported by the service.",
+            "description": "The term specifies a regular expression that describes the allowable values for an action parameter or a read-write property as supported by the service.",
             "type": "string",
             "readonly": true
         },
diff --git a/redfish-core/schema/dmtf/json-schema/redfish-payload-annotations.v1_2_2.json b/redfish-core/schema/dmtf/json-schema/redfish-payload-annotations.v1_2_3.json
similarity index 95%
rename from redfish-core/schema/dmtf/json-schema/redfish-payload-annotations.v1_2_2.json
rename to redfish-core/schema/dmtf/json-schema/redfish-payload-annotations.v1_2_3.json
index 18c7245..a93ea79 100644
--- a/redfish-core/schema/dmtf/json-schema/redfish-payload-annotations.v1_2_2.json
+++ b/redfish-core/schema/dmtf/json-schema/redfish-payload-annotations.v1_2_3.json
@@ -1,7 +1,7 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/redfish-payload-annotations.v1_2_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/redfish-payload-annotations.v1_2_3.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2023 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2024 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "properties": {
         "@Redfish.ActionInfo": {
             "description": "The term can be applied to an action to specify a URI to an ActionInfo resource that describes the parameters supported by this instance of the action.",
@@ -134,7 +134,7 @@
             "readonly": true
         },
         "^([a-zA-Z_][a-zA-Z0-9_]*)?@Redfish.AllowableNumbers$": {
-            "description": "The term specifies the numeric values or duration values, inclusive ranges of values, and incremental step values for a read-write property that are supported by the service, as defined in the 'Allowable values for numbers and durations' clause of the Redfish Specification.",
+            "description": "The term specifies the numeric values or duration values, inclusive ranges of values, and incremental step values for an action parameter or a read-write property that are supported by the service, as defined in the 'Allowable values for numbers and durations' clause of the Redfish Specification.",
             "type": "array",
             "items": {
                 "type": "string"
@@ -142,7 +142,7 @@
             "readonly": true
         },
         "^([a-zA-Z_][a-zA-Z0-9_]*)?@Redfish.AllowablePattern$": {
-            "description": "The term specifies a regular expression that describes the allowable values for a read-write property as supported by the service.",
+            "description": "The term specifies a regular expression that describes the allowable values for an action parameter or a read-write property as supported by the service.",
             "type": "string",
             "readonly": true
         },
diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index 4207c53..d4e8785 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.1"
+VERSION = "DSP8010_2024.2"
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
@@ -72,19 +72,18 @@
 csdl_filenames = []
 json_schema_files = defaultdict(list)
 
-
 for zip_file in zip_ref.infolist():
     if zip_file.is_dir():
         continue
-    if zip_file.filename.startswith("csdl/"):
+    if zip_file.filename.startswith(VERSION + "/csdl/"):
         csdl_filenames.append(os.path.basename(zip_file.filename))
-    elif zip_file.filename.startswith("json-schema/"):
+    elif zip_file.filename.startswith(VERSION + "/json-schema/"):
         filename = os.path.basename(zip_file.filename)
         filenamesplit = filename.split(".")
         json_schema_files[filenamesplit[0]].append(filename)
-    elif zip_file.filename.startswith("openapi/"):
+    elif zip_file.filename.startswith(VERSION + "/openapi/"):
         pass
-    elif zip_file.filename.startswith("dictionaries/"):
+    elif zip_file.filename.startswith(VERSION + "/dictionaries/"):
         pass
 
 # sort the json files by version
@@ -99,12 +98,12 @@
 
 for csdl_file in csdl_filenames:
     with open(os.path.join(schema_path, csdl_file), "wb") as schema_out:
-        content = zip_ref.read(os.path.join("csdl", csdl_file))
+        content = zip_ref.read(os.path.join(VERSION + "/csdl", csdl_file))
         content = content.replace(b"\r\n", b"\n")
         schema_out.write(content)
 
 for schema_filename, versions in json_schema_files.items():
-    zip_filepath = os.path.join("json-schema", versions[0])
+    zip_filepath = os.path.join(VERSION + "/json-schema", versions[0])
 
     with open(
         os.path.join(json_schema_path, versions[0]), "wb"