Index: HDDefs.h
===================================================================
diff -u -re52a734267f68afe0147f7114965a1847c3c6dc2 -r5c973b51fea2502bce87f7cdae8dd899f4148065
--- HDDefs.h	(.../HDDefs.h)	(revision e52a734267f68afe0147f7114965a1847c3c6dc2)
+++ HDDefs.h	(.../HDDefs.h)	(revision 5c973b51fea2502bce87f7cdae8dd899f4148065)
@@ -109,23 +109,10 @@
     STANDBY_START_STATE = 0,                                     ///< Start standby (home actuators).
     STANDBY_WAIT_FOR_TREATMENT_STATE,                            ///< Wait for treatment.
     STANDBY_WAIT_FOR_DISINFECT_STATE,                            ///< Wait for UI to send disinfect option.
-
-    STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE,                ///< Wait for DG flush command response.
-    STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE,                    ///< Wait for DG flush to start.
-    STANDBY_DG_FLUSH_IN_PROGRESS_STATE,                          ///< DG flush operation is in progress
-
-    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE,       ///< Wait for DG heat disinfect command response.
-    STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE,           ///< Wait for DG heat disinfect to start.
-    STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE,                 ///< DG heat disinfect operation is in progress.
-
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE,       ///< Wait for DG chemical disinfect command response.
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE,           ///< Wait for DG chemical disinfect to start.
-    STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE,                 ///< DG chemical disinfect operation is in progress
-
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_FLUSH_CMD_RESPONSE_STATE, ///< Wait for DG chemical disinfect flush command response.
-    STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_FLUSH_TO_START_STATE,     ///< Wait for DG chemical disinfect flush to start.
-    STANDBY_DG_CHEM_DISINFECT_FLUSH_IN_PROGRESS_STATE,           ///< DG chemical disinfect flush operation is in progress
-    NUM_OF_STANDBY_STATES                                        ///< Number of standby states (sub-modes)
+    STANDBY_WAIT_FOR_DG_CLEANING_MODE_CMD_RESPONSE_STATE,        ///< Wait for DG cleaning mode command response state.
+    STANDBY_WAIT_FOR_DG_CLEANING_MODE_TO_START_STATE,            ///< Wait for DG cleaning mode to start state.
+    STANDBY_CLEANING_MODE_IN_PROGRESS_STATE,                     ///< Cleaning mode in progress state.
+    NUM_OF_STANDBY_STATES                                        ///< Number of standby states (sub-modes).
 };
 typedef enum HD_Standby_States HD_STANDBY_STATE_T;               ///< Type for HD standby states enumeration
 
@@ -822,19 +809,22 @@
     GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH,                   ///< Chemical disinfect flush stop user confirmation
     GENERIC_CONFIRM_ID_DISINFECT_CHEM_FLUSH_SAMPLE_PASS_FAIL,           ///< Chemical disinfect sample flush pass/fail
     GENERIC_CONFIRM_ID_TREATMENT_END,                                   ///< End treatment user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_STOP_ACTIVE_COOL,                      ///< Active cool stop user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_STOP_RO_PERMEATE_SAMPLE,               ///< RO permeate sample stop user confirmation
+    GENERIC_CONFIRM_ID_RO_PERMEATE_SAMPLE_STOP_OR_DISPENSE,             ///< RO permeate sample stop or dispense
     NUM_OF_GENERIC_CONFIRM_IDS,                                         ///< Total number of generic confirm IDs
 };
 typedef enum Generic_Confirm_Id GENERIC_CONFIRM_ID_T;                   ///< Type for generic confirm enumeration
 
 /// List of confirmation request status
 typedef enum Confirmation_Status
 {
-    CONFIRMATION_REQUEST_STATUS_REJECTED = 0,          ///< Confirmation status rejected
-    CONFIRMATION_REQUEST_STATUS_ACCEPTED,              ///< Confirmation status accepted
-    CONFIRMATION_REQUEST_STATUS_TIMEOUT,               ///< Confirmation status timeout
-    CONFIRMATION_REQUEST_STATUS_PENDING,               ///< Confirmation status pending response
-    CONFIRMATION_REQUEST_STATUS_UNUSED,                ///< Confirmation status Unused
-    NUM_OF_CONFIRMATION_REQUEST_STATUS                 ///< Number of confirmation status
+    CONFIRMATION_REQUEST_STATUS_REJECTED = 0,                           ///< Confirmation status rejected
+    CONFIRMATION_REQUEST_STATUS_ACCEPTED,                               ///< Confirmation status accepted
+    CONFIRMATION_REQUEST_STATUS_TIMEOUT,                                ///< Confirmation status timeout
+    CONFIRMATION_REQUEST_STATUS_PENDING,                                ///< Confirmation status pending response
+    CONFIRMATION_REQUEST_STATUS_UNUSED,                                 ///< Confirmation status Unused
+    NUM_OF_CONFIRMATION_REQUEST_STATUS                                  ///< Number of confirmation status
 } CONFIRMATION_REQUEST_STATUS_T;
 
 /**@}*/