Index: AlarmDefs.h
===================================================================
diff -u -r2000f0a9248fe1a24976aa437c8dfcd35487627e -r9c56fa6488d3872c949df06a47b68aacef32b9d1
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 2000f0a9248fe1a24976aa437c8dfcd35487627e)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 9c56fa6488d3872c949df06a47b68aacef32b9d1)
@@ -346,6 +346,9 @@
     { ALARM_PRIORITY_LOW,     32,   0,              ALARM_ID_NO_ALARM,                            FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, TRUE , FALSE, FALSE }, // ALARM_ID_END_OF_DIALYSIS_TREATMENT_WARNING
     { ALARM_PRIORITY_MEDIUM,  26,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM
     { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM_HIGH
+    { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_HEAT_DISINFECT_CYCLE_FAILED
+    { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_RO_PUMP_RAMP_UP_TO_FLOW_TIMEOUT
+    { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE
 };
 
 #endif // included by AlarmMgmt.c
Index: DGDefs.h
===================================================================
diff -u -r2000f0a9248fe1a24976aa437c8dfcd35487627e -r9c56fa6488d3872c949df06a47b68aacef32b9d1
--- DGDefs.h	(.../DGDefs.h)	(revision 2000f0a9248fe1a24976aa437c8dfcd35487627e)
+++ DGDefs.h	(.../DGDefs.h)	(revision 9c56fa6488d3872c949df06a47b68aacef32b9d1)
@@ -198,23 +198,23 @@
 enum DG_Heat_States
 {
     DG_HEAT_DISINFECT_STATE_START = 0,                          ///< Heat disinfect, start mode state
-    DG_HEAT_DISINFECT_STATE_DRAIN_R1,
-    DG_HEAT_DISINFECT_STATE_DRAIN_R2,
-    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN,
-    DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION,
-    DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2,
-    DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1,
-    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2,
-    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1,
-    DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER,
-    DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2,
-    DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER,
-    DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1,
-    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1,
-    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2,
-    DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2,
-    DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1,
-    DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION,
+    DG_HEAT_DISINFECT_STATE_DRAIN_R1,                           ///< Heat disinfect, drain R1 state
+    DG_HEAT_DISINFECT_STATE_DRAIN_R2,                           ///< Heat disinfect, drain R2 state
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN,                        ///< Heat disinfect, flush drain state
+    DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION,                  ///< Heat disinfect, flush circulation state
+    DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2,                    ///< Heat disinfect, flush R1 and R2
+    DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1,              ///< Heat disinfect, flush R2 and drain R1
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2,                     ///< Heat disinfect, flush drain R2
+    DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1,                     ///< Heat disinfect, flush drain R1
+    DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER,                    ///< Heat disinfect, fill with water
+    DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2,                 ///< Heat disinfect, disinfect R1 to R2
+    DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER,             ///< Heat disinfect, fill R2 with hot water
+    DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1,                 ///< Heat disinfect, disinfect R2 to R1
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1,                       ///< Heat disinfect, mix drain R1
+    DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2,                       ///< Heat disinfect, mix drain R2
+    DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2,                     ///< Heat disinfect, rinse R1 to R2
+    DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1,        ///< Heat disinfect, rinse R2 to R1 and drain R1
+    DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION,                  ///< Heat disinfect, rinse circulation
     DG_HEAT_DISINFECT_STATE_COMPLETE,                           ///< Heat disinfect, complete
     NUM_OF_DG_HEAT_DISINFECT_STATES                             ///< Number of heat disinfect mode states
 };