Index: AlarmDefs.h
===================================================================
diff -u -rc736e4356576ade478873b1b13fb9cc1aad6388a -r0ba9faa505a5051d05941d709465d1624f48c775
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision c736e4356576ade478873b1b13fb9cc1aad6388a)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 0ba9faa505a5051d05941d709465d1624f48c775)
@@ -140,6 +140,7 @@
     ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE,                        ///< RO pump flow rate out of range
     ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE,                          ///< DG flow rate out of upper range
     ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE,                          ///< DG flow rate out of lower range
+    ALARM_ID_RO_PUMP_RAMP_UP_TO_FLOW_TIMEOUT,                       ///< DG RO pump ramp up to target flow time out
     ALARM_ID_RO_PUMP_OFF_FAULT,                                     ///< DG RO pump off fault
     ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE,                         ///< DG RO pump pressure out of range
     ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE,                           ///< DG drain pump RPM out of range
Index: DGDefs.h
===================================================================
diff -u -r6fa58eaae593b67a54289f75a091dc0c710d4500 -r0ba9faa505a5051d05941d709465d1624f48c775
--- DGDefs.h	(.../DGDefs.h)	(revision 6fa58eaae593b67a54289f75a091dc0c710d4500)
+++ DGDefs.h	(.../DGDefs.h)	(revision 0ba9faa505a5051d05941d709465d1624f48c775)
@@ -245,7 +245,22 @@
     DG_HEAT_DISINFECT_STATE_COMPLETE,                           ///< Heat disinfect, complete state
     NUM_OF_DG_HEAT_DISINFECT_STATES                             ///< Number of heat disinfect mode states
 };
-typedef enum DG_Heat_States DG_HEAT_DISINFECT_STATE_T;          ///< Type for DG heat disinfect states enumeration
+typedef enum DG_Heat_States DG_HEAT_DISINFECT_STATE_T;          ///< Type for DG heat disinfect states enumeration
+
+/// Enumeration of heat disinfect mode states.
+enum DG_Heat_UI_States
+{
+    HEAT_DISINFECT_UI_STATE_START = 0,                          ///< Heat disinfect UI, start state
+    HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT,             ///< Heat disinfect UI, flush before disinfect state
+    HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER,                      ///< Heat disinfect UI, heat up water state
+    HEAT_DISINFECT_UI_STATE_DISINFECT_DEVICE,                   ///< Heat disinfect UI, disinfect device state
+    HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE,                   ///< Heat disinfect UI, cool down device state
+    HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT,              ///< Heat disinfect UI, flush after disinfect state
+    HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT,                   ///< Heat disinfect UI, cancel disinfect state
+    HEAT_DISINFECT_UI_STATE_COMPLETE,                           ///< Heat disinfect UI, complete state
+    NUM_OF_HEAT_DISINFECT_UI_STATES                             ///< Number of heat disinfect mode UI states
+};
+typedef enum DG_Heat_UI_States DG_HEAT_DISINFECT_UI_STATE_T;    ///< Type for DG heat disinfect UI states enumeration
 
 /**@}*/
 
@@ -287,17 +302,19 @@
 typedef enum DG_Chem_States DG_CHEM_DISINFECT_STATE_T;          ///< Type for DG chemical disinfect states enumeration
 
 /// Enumeration of chemical disinfect mode UI states
-enum DG_Chem_UI_State
+enum DG_Chem_UI_States
 {
-    CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT = 0,         ///< Chemical disinfect, flush before disinfect state
-    CHEM_DISINFECT_UI_STATE_REMOVE_ACID,                        ///< Chemical disinfect, remove acid state
-    CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE,                   ///< Chemical disinfect, disinfect device state
-    CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT,              ///< Chemical disinfect, flush after disinfect state
-    CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT,                   ///< Chemical disinfect, cancel disinfect state
-    CHEM_DISINFECT_UI_STATE_COMPLETE,                           ///< Chemical disinfect, complete state
+    CHEM_DISINFECT_UI_STATE_START = 0,                          ///< Chemical disinfect UI, start state
+    CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT,             ///< Chemical disinfect UI, flush before disinfect state
+    CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID,                 ///< Chemical disinfect UI, mix water and acid state
+    CHEM_DISINFECT_UI_STATE_REMOVE_ACID,                        ///< Chemical disinfect UI, remove acid state
+    CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE,                   ///< Chemical disinfect UI, disinfect device state
+    CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT,              ///< Chemical disinfect UI, flush after disinfect state
+    CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT,                   ///< Chemical disinfect UI, cancel disinfect state
+    CHEM_DISINFECT_UI_STATE_COMPLETE,                           ///< Chemical disinfect UI, complete state
     NUM_OF_CHEM_DISINFECT_UI_STATES                             ///< Number of chemical disinfect UI states
 };
-typedef enum DG_Chem_UI_State DG_CHEM_DISINFECT_UI_STATE_T;     ///< Type for DG chemical disinfect UI states enumeration
+typedef enum DG_Chem_UI_States DG_CHEM_DISINFECT_UI_STATE_T;    ///< Type for DG chemical disinfect UI states enumeration
 
 /**@}*/
 
Index: MsgDefs.h
===================================================================
diff -u -r353390594dddfd95da8101ccb1fa3c9f246d6f4f -r0ba9faa505a5051d05941d709465d1624f48c775
--- MsgDefs.h	(.../MsgDefs.h)	(revision 353390594dddfd95da8101ccb1fa3c9f246d6f4f)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 0ba9faa505a5051d05941d709465d1624f48c775)
@@ -183,6 +183,8 @@
     MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST = 0x97,                        ///< UI active alarms list request
     MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE = 0x98,               ///< HD active alarms list request response
     MSG_ID_HD_SERIAL_NUMBER = 0x99,                                     ///< HD serial number
+    MSG_ID_DG_CHEM_DISINFECT_TO_UI_DATA_PUBLISH = 0x9A,                 ///< DG chemical disinfect data publish to UI
+    MSG_ID_DG_HEAT_DISINFECT_TO_UI_DATA_PUBLISH = 0x9B,                 ///< DG heat disinfect data publish to UI
 
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing