diff --git a/meson.build b/meson.build
index f6a66f1..eb2d3a9 100644
--- a/meson.build
+++ b/meson.build
@@ -223,6 +223,16 @@
       summary({'power-thermal' :'-DBMCWEB_ALLOW_DEPRECATED_POWER_THERMAL'
               },section : 'Enabled Features')
     endif
+
+    if( get_option('redfish-new-powersubsystem-thermalsubsystem').enabled())
+     add_project_arguments([
+       '-DBMCWEB_NEW_POWERSUBSYSTEM_THERMALSUBSYSTEM'
+       ],
+      language : 'cpp')
+
+      summary({'new-powersubsystem-thermalsubsystem' :'-DBMCWEB_NEW_POWERSUBSYSTEM_THERMALSUBSYSTEM'
+              },section : 'Enabled Features')
+    endif
   endif
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index 2387402..ff5b887 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -30,6 +30,7 @@
 option('google-api', type : 'feature', value : 'disabled', description : 'Enable the Google specific functionality. Paths are under \'/google/v1/\'')
 option('http-body-limit', type: 'integer', min : 0, max : 512, value : 30, description : 'Specifies the http request body length limit')
 option('redfish-allow-deprecated-hostname-patch', type : 'feature', value : 'disabled', description : 'Enable/disable Managers/bmc/NetworkProtocol HostName PATCH commands. The default condition is to prevent HostName changes from this URI, following the Redfish schema. Enabling this switch permits the HostName to be PATCHed at this URI. In Q4 2021 this feature will be removed, and the Redfish schema enforced, making the HostName read-only.')
+option('redfish-new-powersubsystem-thermalsubsystem', type : 'feature', value : 'disabled', description : 'Enable/disable the new PowerSubsystem, ThermalSubsystem, and all children schemas. This includes displaying all sensors in the SensorCollection. At a later date, this feature will be defaulted to enabled.')
 option('redfish-allow-deprecated-power-thermal', type : 'feature', value : 'enabled', description : 'Enable/disable the old Power / Thermal. The default condition is allowing the old Power / Thermal.')
 option ('https_port', type : 'integer', min : 1, max : 65535, value : 443, description : 'HTTPS Port number.')
 
diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp
index cb7ea15..f9d806b 100644
--- a/redfish-core/lib/sensors.hpp
+++ b/redfish-core/lib/sensors.hpp
@@ -64,6 +64,14 @@
               {"/xyz/openbmc_project/sensors/power",
                "/xyz/openbmc_project/sensors/current",
                "/xyz/openbmc_project/sensors/airflow",
+#ifdef BMCWEB_NEW_POWERSUBSYSTEM_THERMALSUBSYSTEM
+               "/xyz/openbmc_project/sensors/voltage",
+               "/xyz/openbmc_project/sensors/fan_tach",
+               "/xyz/openbmc_project/sensors/temperature",
+               "/xyz/openbmc_project/sensors/fan_pwm",
+               "/xyz/openbmc_project/sensors/altitude",
+               "/xyz/openbmc_project/sensors/energy",
+#endif
                "/xyz/openbmc_project/sensors/utilization"}},
              {node::thermal,
               {"/xyz/openbmc_project/sensors/fan_tach",