Index: AlarmDefs.h
===================================================================
diff -u -r8e89cc9d7579dddf4eed8a40039c80803b4ff33f -re956fcffc75bbd1bfa9433f713772de41aca8b57
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 8e89cc9d7579dddf4eed8a40039c80803b4ff33f)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision e956fcffc75bbd1bfa9433f713772de41aca8b57)
@@ -220,6 +220,8 @@
     ALARM_ID_DIALYSATE_TEMPERATURE_HIGH = 182,                      ///< HD dialysate temperature too high alarm
     ALARM_ID_DIALYSATE_TEMPERATURE_LOW = 183,                       ///< HD dialysate temperature too low alarm
     ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE = 184,                         ///< DG monitored voltage is out of range
+    ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT = 185,               ///< DG drain circulation line timeout
+    ALARM_ID_DG_INVALID_LOAD_CELL_VALUE = 186,                      ///< DG invalid load cell value
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -510,7 +512,9 @@
     { ALARM_PRIORITY_LOW,     28,   ALM_ESC_5_MIN,  ALARM_ID_DIALYSATE_TEMPERATURE_TOO_HIGH, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIALYSATE_TEMPERATURE_HIGH
     { ALARM_PRIORITY_LOW,     29,   ALM_ESC_5_MIN,  ALARM_ID_DIALYSATE_TEMPERATURE_TOO_LOW,  FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIALYSATE_TEMPERATURE_LOW
     { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE
-     // Priority              Rank   Escalate In     Escalate To                             Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck
+    { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT
+    { ALARM_PRIORITY_HIGH,     3,   0,              ALARM_ID_NO_ALARM,                       TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_INVALID_LOAD_CELL_VALUE
+    // Priority              Rank   Escalate In     Escalate To                             Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck
 };
 
 #endif // included by AlarmMgmt.c
Index: DGDefs.h
===================================================================
diff -u -rf0654808a9332e543a221bf3f52406f1a8269655 -re956fcffc75bbd1bfa9433f713772de41aca8b57
--- DGDefs.h	(.../DGDefs.h)	(revision f0654808a9332e543a221bf3f52406f1a8269655)
+++ DGDefs.h	(.../DGDefs.h)	(revision e956fcffc75bbd1bfa9433f713772de41aca8b57)
@@ -196,7 +196,7 @@
     DG_FLUSH_STATE_FLUSH_CONCENTRATE_STRAWS,        ///< Flush, flush concentrate straws state
     DG_FLUSH_STATE_FLUSH_R1_TO_R2,                  ///< Flush, flush reservoir 1 to reservoir 2 state
     DG_FLUSH_STATE_FLUSH_R2_AND_DRAIN_R1,           ///< Flush, flush reservoir 2 and drain reservoir 1 state
-    DG_FLUSH_STATE_FLUSH_DRAIN_LINE,                ///< Flush, flush drain line state
+    DG_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE,    ///< Flush, flush circulation drain line state
     DG_FLUSH_STATE_FLUSH_CIRCULATION,               ///< Flush, flush circulation state
     DG_FLUSH_STATE_FLUSH_WITH_FRESH_WATER,          ///< Flush, flush with fresh water
     DG_FLUSH_STATE_CANCEL_BASIC_PATH,               ///< Flush, cancel basic path state