Index: AlarmDefs.h
===================================================================
diff -u -r1ff9f1e8dc0b139448a08868fe6e00f8976940c2 -ra1a5a19a97fd1804ac0c03708fa07fdcc6a293f4
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 1ff9f1e8dc0b139448a08868fe6e00f8976940c2)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision a1a5a19a97fd1804ac0c03708fa07fdcc6a293f4)
@@ -83,7 +83,7 @@
     ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 45,                   ///< HW usage data (treatment time in HD and total consumed water in DG) failure
     ALARM_ID_AVAILABLE_1 = 46,                                      ///< Last disinfection date CRC error
     ALARM_ID_AVAILABLE_2 = 47,                                      ///< Pressure at outlet of RO pump is out of range
-    ALARM_ID_TEMPERATURE_SENSORS_FAULT = 48,                        ///< DG temperature sensors fault
+    ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT = 48,                 ///< DG temperature sensors ADC fault
     ALARM_ID_HD_FPGA_COMM_TIMEOUT = 49,                             ///< HD FPGA communication down for too long
     ALARM_ID_HD_COMM_TIMEOUT = 50,                                  ///< HD communication timeout
     ALARM_ID_VALVE_CONTROL_FAILURE = 51,                            ///< FPGA not accepting commanded valve states
@@ -266,6 +266,7 @@
     ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED = 228,                   ///< DG firmware image integrity POST test failed
     ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 229,                    ///< HD no cartridge self-test timeout
     ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT = 230,                        ///< HD dry self-test timeout
+    ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT = 231,                     ///< DG temperature sensor error flag fault.
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -424,7 +425,7 @@
     { ALARM_PRIORITY_HIGH,   999,   0,              ALARM_ID_NO_ALARM,                       FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR
     { ALARM_PRIORITY_HIGH,     1,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE }, // ALARM_ID_AVAILABLE_1
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE }, // ALARM_ID_AVAILABLE_2
-    { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE }, // ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE
+    { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE }, // ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE }, // ALARM_ID_HD_FPGA_COMM_TIMEOUT
     { ALARM_PRIORITY_HIGH,   999,   0,              ALARM_ID_NO_ALARM,                       FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_COMM_TIMEOUT
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE,  TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE }, // ALARM_ID_VALVE_CONTROL_FAILURE
Index: DGDefs.h
===================================================================
diff -u -re678e0ee6c231ae6db72c0e58a21d1f31cd5b66b -ra1a5a19a97fd1804ac0c03708fa07fdcc6a293f4
--- DGDefs.h	(.../DGDefs.h)	(revision e678e0ee6c231ae6db72c0e58a21d1f31cd5b66b)
+++ DGDefs.h	(.../DGDefs.h)	(revision a1a5a19a97fd1804ac0c03708fa07fdcc6a293f4)
@@ -266,6 +266,7 @@
     DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R2,                     ///< Chemical disinfect, flush drain R2 state
     DG_CHEM_DISINFECT_STATE_FLUSH_DRAIN_R1,                     ///< Chemical disinfect, flush drain R1 state
     DG_CHEM_DISINFECT_STATE_FILL_WITH_WATER_AND_DISINFECTANT,   ///< Chemical disinfect, fill with water and disinfectant state
+    DG_CHEM_DISINFECT_STATE_REMOVE_ACID_BOTTLE_FROM_UI,         ///< Chemical disinfect, remove the acid bottle from UI state
     DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2,                 ///< Chemical disinfect, disinfect R1 to R2 state
     DG_CHEM_DISINFECT_STATE_FILL_R2_WITH_DISINFECTANT,          ///< Chemical disinfect, fill R2 with disinfectant state
     DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1,                 ///< Chemical disinfect, disinfect R2 to R1 state
@@ -281,8 +282,21 @@
     DG_CHEM_DISINFECT_STATE_COMPLETE,                           ///< Chemical disinfect, complete state
     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
+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
+{
+    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
+    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
+
 /**@}*/
 
 /**