Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r1afbd991f98562fda8059c75c59c0ea5b64243e4 -r79259b62a121d7600e081700ce522cbf612c9375
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 1afbd991f98562fda8059c75c59c0ea5b64243e4)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 79259b62a121d7600e081700ce522cbf612c9375)
@@ -66,6 +66,8 @@
     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_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.
     NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
 } SOFTWARE_CONFIG_T;
 #endif
@@ -224,8 +226,12 @@
 typedef enum dg_usage_items
 {
     USAGE_INFO_RO_GEN_WATER = 0,                                                                                ///< Usage info RO generated water.
-    USAGE_INFO_HEAT_DISINFECT,                                                                                  ///< Usage info heat disinfect.
-    USAGE_INFO_CHEMICAL_DISINFECT,                                                                              ///< Usage info chemical disinfect.
+    USAGE_INFO_BASIC_FLUSH,                                                                                     ///< Usage info basic flush.
+    USAGE_INFO_CHEM_DIS_START,                                                                                  ///< Usage info chemcial disinfect start.
+    USAGE_INFO_CHEM_DIS,                                                                                        ///< Usage info chemical disinfect complete.
+    USAGE_INFO_CHEM_FLUSH,                                                                                      ///< Usage info chemical flush complete.
+    USAGE_INFO_HEAT_DIS,                                                                                        ///< Usage info heat disinfect complete.
+    USAGE_INFO_FILTER_FLUSH,                                                                                    ///< Usage info filter flush complete.
     USAGE_INFO_DISIFNECT_STATUS,                                                                                ///< Usage info disinfect (heat or chemical) status.
     NUM_OF_USAGE_INFO_ITEMS                                                                                     ///< Number of usage info items.
 } DG_USAGE_INFO_ITEMS_T;
@@ -457,16 +463,6 @@
     U16 crc;                                                                                                    ///< CRC for the DG system record structure.
 } DG_SYSTEM_RECORD_T;
 
-/// DG service record structure
-typedef struct
-{
-    U08 serviceLoc;                                                                                             ///< DG service location.
-    U32 lastServiceEpochDate;                                                                                   ///< DG last service date in epoch.
-    U32 serviceIntervalSeconds;                                                                                 ///< DG service interval in seconds.
-    U32 lastResetTimeEpoch;                                                                                     ///< Last time the record was reset in epoch.
-    U16 crc;                                                                                                    ///< CRC for the DG service record structure.
-} DG_SERVICE_RECORD_T;
-
 /// DG scheduled runs record structure
 typedef struct
 {
@@ -480,18 +476,6 @@
     DG_SCHEDULED_RUN_T dgScheduledRun[ NUM_OF_DG_SCHEDULED_RUNS ];                                              ///< DG scheduled run.
 } DG_SCHEDULED_RUN_RECORD_T;
 
-/// DG usage info structure.
-typedef struct
-{
-    F32 roWaterGenTotalL;                                                                                       ///< Total RO water generated in liters. (Cannot be reset)
-    F32 roWaterGenSinceLastServiceL;                                                                            ///< RO water generated since last treatment in liters.
-    U32 lastHeatDisDateEpoch;                                                                                   ///< Last heat disinfect date in epoch.
-    U32 lastChemicalDisDateEpoch;                                                                               ///< Last chemical disinfect date in epoch.
-    BOOL isDisinfected;                                                                                         ///< Disinfect status boolean flag.
-    U32 lastResetTimeEpoch;                                                                                     ///< Last time the record was reset in epoch.
-    U16 crc;                                                                                                    ///< CRC for the DG usage info structure.
-} DG_USAGE_INFO_RECORD_T;
-
 /// DG heaters information structure
 typedef struct
 {