Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rd5ee0e84a64ee7942b9c2898035e2514a7c58b8a -r3a10a015545b7adb9c207423742fb33dfd59fabd
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision d5ee0e84a64ee7942b9c2898035e2514a7c58b8a)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 3a10a015545b7adb9c207423742fb33dfd59fabd)
@@ -114,7 +114,7 @@
 static DG_FLUSH_STATE_T handleFlushModeComplete( void );
 
 static void failFlushMode( void );
-static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout );
+static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout, bool resetStateTimer S);
 static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout );
 static void publishFlushData( void );
 static void monitorModeFlush( void );
@@ -615,7 +615,7 @@
     // If reservoir 1 is empty, turn off the drain pump
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS );
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS, FALSE);
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
@@ -632,7 +632,7 @@
     // First reservoir 2 must be completely full but if reservoir 1 is filled before reservoir 2 is full, alarm
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvr2Status )
     {
-        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS, FALSE);
 
         U32 drainPumpRPM = getDrainPumpTargetRPM();
         // Keep monitoring the status of reservoir 1 as the same time
@@ -941,7 +941,7 @@
  * @param timeout is the fill up time out that is checked against
  * @return the status of the reservoirs during filling
  *************************************************************************/
-static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout )
+static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout, bool resetStateTimer = TRUE)
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_BELOW_TARGET;
     F32 volume = 0.0;