Index: AlarmDefs.h
===================================================================
diff -u -rbecfbc4d11de64248085cde7f064d4e1cf63f978 -r87c28967b1b04f37e1a2ddce7b66643650e9291a
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision becfbc4d11de64248085cde7f064d4e1cf63f978)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 87c28967b1b04f37e1a2ddce7b66643650e9291a)
@@ -192,7 +192,7 @@
     ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = 154,                               ///< EEPROM operations (read, write, erase) failure
     ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC = 155,                         ///< DG software configuration record invalid CRC
     ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 156,                          ///< HW usage data (treatment time in HD and total consumed water in DG) failure
-    ALARM_ID____AVAILABLE_23 = 157,                                         ///< This alarm ID is available for use
+    ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE = 157,                    ///< Inlet water temperature is not within specified range
     ALARM_ID____AVAILABLE_24 = 158,                                         ///< This alarm ID is available for use
     ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 159,                  ///< Dialysate inlet pump failed flow vs. motor speed check.
     ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 160,                         ///< Blood pump rotor speed too high
@@ -605,7 +605,7 @@
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE,                        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_LOW,    799,  FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE,  ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC,                  0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR,                   0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_23,                                  0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , TRUE,  TRUE,  TRUE,  TRUE,  TRUE,  TRUE , FALSE, FALSE, ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE,             0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_24,                                  0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK,           0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,   799,  FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH,                  0,              ALARM_ID_NO_ALARM },
@@ -933,7 +933,7 @@
     { 799, ALARM_ID_NVDATA_EEPROM_OPS_FAILURE },
     { 799, ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC },
     { 799, ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR },
-    { 799, ALARM_ID____AVAILABLE_23 },
+    { 799, ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE },
     { 799, ALARM_ID____AVAILABLE_24 },
     { 799, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK },
     { 799, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH },
Index: DGDefs.h
===================================================================
diff -u -rbecfbc4d11de64248085cde7f064d4e1cf63f978 -r87c28967b1b04f37e1a2ddce7b66643650e9291a
--- DGDefs.h	(.../DGDefs.h)	(revision becfbc4d11de64248085cde7f064d4e1cf63f978)
+++ DGDefs.h	(.../DGDefs.h)	(revision 87c28967b1b04f37e1a2ddce7b66643650e9291a)
@@ -158,12 +158,14 @@
 /// Enumeration of fill mode states.
 enum DG_Fill_Mode_States
 {
-    DG_FILL_MODE_STATE_START = 0,                       ///< Start fill mode state
-    DG_FILL_MODE_STATE_CHECK_INLET_WATER,               ///< Check inlet water quality state
-    DG_FILL_MODE_STATE_BICARB_PUMP_CHECK,               ///< Run bicarb concentrate pump and check conductivity range
-    DG_FILL_MODE_STATE_ACID_PUMP_CHECK,                 ///< Run acid concentrate pump and check conductivity range
-    DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION,            ///< Dialysate production state
-    DG_FILL_MODE_STATE_DELIVER_DIALYSATE,               ///< Deliver dialysate state
+    DG_FILL_MODE_STATE_START = 0,                       ///< Start fill mode state
+    DG_FILL_MODE_STATE_TEST_INLET_WATER,                ///< Test inlet water quality state
+    DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES,         ///< Prime the acid and bicarb concentrate lines
+    DG_FILL_MODE_STATE_FLUSH_BUBBLES,                   ///< Flush the bubbles in the lines state
+    DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY,        ///< Test the conductivity range of the bicarb concentrate state
+    DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY,          ///< Test the conductivity range of the acid concentrate state
+    DG_FILL_MODE_STATE_PRODUCE_DIALYSATE,               ///< Dialysate production state
+    DG_FILL_MODE_STATE_DELIVER_DIALYSATE,               ///< Dialysate deliver state
     DG_FILL_MODE_STATE_PAUSED,                          ///< Dialysate generation pause state
     NUM_OF_DG_FILL_MODE_STATES                          ///< Number of fill mode states
 };