Index: AlarmDefs.h
===================================================================
diff -u -r626998cba6848e7b7dfebdb85e5223e600c4cf80 -r670ade594d906f26befdb6a164dda8b8d9d4d38e
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 626998cba6848e7b7dfebdb85e5223e600c4cf80)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 670ade594d906f26befdb6a164dda8b8d9d4d38e)
@@ -122,6 +122,9 @@
     ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 91,                   ///< FPGA reports failure reading arterial pressure sensor.
     ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 92,                     ///< FPGA reports failure reading venous pressure sensor.
     ALARM_ID_UV_REACTOR_NOT_HEALTHY = 93,                           ///< UV reactor not healthy (either inlet or outlet)
+    ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE = 94,              ///< Post-acid concentrate conductivity out of range.
+    ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 95,            ///< Post-bicarb concentrate conductivity out of range.
+    ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE = 96,                   ///< RO pump flow rate out of range.
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
Index: DGDefs.h
===================================================================
diff -u -r626998cba6848e7b7dfebdb85e5223e600c4cf80 -r670ade594d906f26befdb6a164dda8b8d9d4d38e
--- DGDefs.h	(.../DGDefs.h)	(revision 626998cba6848e7b7dfebdb85e5223e600c4cf80)
+++ DGDefs.h	(.../DGDefs.h)	(revision 670ade594d906f26befdb6a164dda8b8d9d4d38e)
@@ -145,6 +145,7 @@
 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_DIALYSATE_PRODUCTION,            ///< Dialysate production state
     DG_FILL_MODE_STATE_DELIVER_DIALYSATE,               ///< Deliver dialysate state
     NUM_OF_DG_FILL_MODE_STATES                          ///< Number of fill mode states
Index: MsgDefs.h
===================================================================
diff -u -rcea574d58418b1add57e07db0b7d7dbb646df2e9 -r670ade594d906f26befdb6a164dda8b8d9d4d38e
--- MsgDefs.h	(.../MsgDefs.h)	(revision cea574d58418b1add57e07db0b7d7dbb646df2e9)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 670ade594d906f26befdb6a164dda8b8d9d4d38e)
@@ -203,6 +203,7 @@
     MSG_ID_DG_OPERATION_MODE_REQUEST = 0xA023,                          ///< DG operation mode request
     MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024,             ///< Concentrate pumps' target speed override request
     MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA025,         ///< UV reactors data publish interval override
+    MSG_ID_CONCENTRATE_PUMP_STATE_CHANGE_REQUEST = 0xA026,              ///< Concentrate pumps' state change request (on / off)
 
     MSG_ID_HD_DEBUG_EVENT = 0xFFF1,                                     ///< HD debug event text to be logged in event log
     MSG_ID_DG_DEBUG_EVENT = 0xFFF2,                                     ///< DG debug event text to be logged in event log