Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -re36086374105f27483ead3d5bcfc88210737895a -rf74b68a865d0708a485b3898fefe8046e2b7cd66
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision e36086374105f27483ead3d5bcfc88210737895a)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision f74b68a865d0708a485b3898fefe8046e2b7cd66)
@@ -48,7 +48,7 @@
     SW_CONFIG_DISABLE_HEATERS_MONITOR,                                                                         ///< Software configuration disable heaters monitor.
     SW_CONFIG_DISABLE_DRAIN_PUMP_MONITOR,                                                                      ///< Software configuration disable drain pump monitor.
     SW_CONFIG_DISABLE_RO_PUMP_MONITOR,                                                                         ///< Software configuration disable RO pump monitor.
-    SW_CONFIG_DISABLE_RO_RATIO_CHECK,                                                                          ///< Software configuration disable RO ratio check
+    SW_CONFIG_DISABLE_RO_RATIO_CHECK,                         // TODO remove                                                  ///< Software configuration disable RO ratio check
     SW_CONFIG_DISABLE_COND_SENSOR_CHECK,                                                                       ///< Software configuration disable conductivity sensor check.
     SW_CONFIG_DISABLE_WATER_QUALITY_CHECK,                                                                     ///< Software configuration disable water quality check.
     SW_CONFIG_DISABLE_FLOW_VS_LOAD_CELL_CHECK_IN_FILL,                                                         ///< Software configuration disable flow vs. load cell check in fill.
@@ -60,10 +60,10 @@
     SW_CONFIG_DISABLE_VOLTAGES_MONITOR,                                                                        ///< Software configuration disable voltages monitor.
     SW_CONFIG_DISABLE_BICARB_ALARMS,                                                                           ///< Software configuration disable bicarb alarms.
     SW_CONFIG_DISABLE_EMPTY_BOTTLES_ALARM,                                                                     ///< Software configuration disable empty bottle alarms.
-    SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST,                                                                ///< Software configuration disable bicarb conductivity test.
-    SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST,                                                                  ///< Software configuration disable acid conductivity test.
+    SW_CONFIG_DISABLE_BICARB_CONDUCTIVITY_TEST,                 // TODO remove                                               ///< Software configuration disable bicarb conductivity test.
+    SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST,                   // TODO remove                                               ///< Software configuration disable acid conductivity test.
     SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM,                                                                  ///< Software configuration disable concentrate pumps speed alarm.
-    SW_CONFIG_DISABLE_MIXING_IN_FILL,                                                                          ///< Software configuration disable mixing in fill.
+    SW_CONFIG_DISABLE_MIXING_IN_FILL,                           // TODO remove                                               ///< Software configuration disable mixing in fill.
     SW_CONFIG_DISABLE_TEMPERATURE_SENSORS_ALARM,                                                               ///< Software configuration disable temperature sensors alarm.
     SW_CONFIG_DISABLE_CONCENTRATE_PUMPS_PARK,                                                                  ///< Software configuration disable concentrate pumps park feature.
     SW_CONFIG_ENABLE_USING_TPO_FOR_PRIMARY_HEATER_CONTROL,                                                     ///< Software configuration enable TPo for primary heater control.