Index: DGDefs.h
===================================================================
diff -u -re956fcffc75bbd1bfa9433f713772de41aca8b57 -r55cc6175207d36e613e8058aa5a71605d67a8abb
--- DGDefs.h	(.../DGDefs.h)	(revision e956fcffc75bbd1bfa9433f713772de41aca8b57)
+++ DGDefs.h	(.../DGDefs.h)	(revision 55cc6175207d36e613e8058aa5a71605d67a8abb)
@@ -253,7 +253,26 @@
 /// Enumeration of chemical disinfect mode states.
 enum DG_Chem_States
 {
-    DG_CHEM_DISINFECT_STATE_START = 0,                  ///< Start chemical disinfect mode state
+    DG_CHEM_DISINFECT_STATE_START = 0,                  ///< Start chemical disinfect mode state
+    DG_CHEM_DISINFECT_STATE_DRAIN_R1,
+    DG_CHEM_DISINFECT_STATE_DRAIN_R2,
+    DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN,
+    DG_CHEM_DISINFECT_STATE_FLUSH_CIRCULATION,
+    DG_CHEM_DISINFECT_STATE_FLUSH_R1_AND_R2,
+    DG_CHEM_DISINFECT_STATE_FLUSH_R1_AND_DRAIN_R1,
+    DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R2,
+    DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R1,
+    DG_CHEM_DISINFECT_STATE_FILL_WITH_WATER_AND_DISINFECTANT,
+    DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2,
+    DG_CHEM_DISINFECT_STATE_FILL_R2_WITH_DISINFECTANT,
+    DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1,
+    DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R1,
+    DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R2,
+    DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2,
+    DG_CHEM_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1,
+    DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2_AND_DRAIN_R2,
+    DG_CHEM_DISINFECT_STATE_RINSE_CIRCULATION,
+    DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH,
     NUM_OF_DG_CHEM_DISINFECT_STATES                     ///< Number of chemical disinfect mode states
 };
 typedef enum DG_Chem_States DG_CHEM_DISINFECT_STATE_T;  ///< Type for DG chemical disinfect states enumeration
Index: MsgDefs.h
===================================================================
diff -u -r820f6f1dad35a2b333136528c2afd40429660eb5 -r55cc6175207d36e613e8058aa5a71605d67a8abb
--- MsgDefs.h	(.../MsgDefs.h)	(revision 820f6f1dad35a2b333136528c2afd40429660eb5)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 55cc6175207d36e613e8058aa5a71605d67a8abb)
@@ -149,13 +149,14 @@
     MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST = 0x75,                        ///< UI request treatment log data message
     MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0x76,                       ///< HD response to UI treatment log data request
     MSG_ID_HD_POST_TREATMENT_STATE = 0x77,                              ///< HD broadcast of post-treatment state
-    MSG_ID___AVAILABLE_16 = 0x78,                                       ///< This msg ID is available for use
+    MSG_ID_DG_START_STOP_CHEM_DSINFECT = 0x78,                          ///< DG start/stop chemical disinfect
     MSG_ID_DG_START_STOP_FLUSH = 0x79,                                  ///< DG start/stop flush mode
     MSG_ID_DG_FLUSH_DATA = 0x7A,                                        ///< DG flush data publish
     MSG_ID_HD_VOLTAGES_DATA = 0x7B,                                     ///< HD voltages data publish
     MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0x7C,                   ///< HD response to UI set alarm audio volume request
     MSG_ID_HD_ALARM_INFORMATION = 0x7D,                                 ///< HD alarm information broadcast message
     MSG_ID_DG_VOLTAGES_DATA = 0x86,                                     ///< DG voltages data publish
+    MSG_ID_DG_CHEM_DISINFECT_DATA = 0x87,                               ///< DG chemical disinfect data publish
 
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
@@ -284,7 +285,7 @@
     MSG_ID___AVAILABLE_13 = 0xA01E,                                     ///< This msg ID is available for use
     MSG_ID___AVAILABLE_14 = 0xA01F,                                     ///< This msg ID is available for use
     MSG_ID___AVAILABLE_15 = 0xA020,                                     ///< This msg ID is available for use
-    MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE = 0xA021,           ///< Heat disinfection data publish interval override request
+    MSG_ID___AVAILABLE_16 = 0xA021,                                     ///< This msg ID is available for use
     MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022,                          ///< DG reset request
     MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE = 0xA023,        ///< DG concentrate pump measured speed override request
     MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024,             ///< Concentrate pumps' target speed override request