Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r3fa496b611a3a84c8aaa882a1b27762c6bc0024c -rcb74a0074b698cfd92cacbaea5bcbfbc6506649b
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 3fa496b611a3a84c8aaa882a1b27762c6bc0024c)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision cb74a0074b698cfd92cacbaea5bcbfbc6506649b)
@@ -40,7 +40,7 @@
 #define RESERVOIR_USED_SETTLE_TIME_MS                     5000                                           ///< Allocated time to settle the depleted reservoir in milliseconds.
 #define RESERVOIR_CYCLE_EXTRA_MARGIN_TIME_MS              8000                                           ///< Reservoir extra time in during the cycle for error in milliseconds.
 
-#define MAX_RESERVOIR_VOLUME_ML                           1900.0F                                        ///< Maximum allowed fluid in a reservoir in milliliters.
+#define MAX_RESERVOIR_VOLUME_ML                           1950.0F                                        ///< Maximum allowed fluid in a reservoir in milliliters.
 #define MAX_RESERVOIR_DILUTION                            0.15F                                          ///< Maximum reservoir dilution limit.
 #define MAX_RESERVOIR_RECIRCULATION_400_MLP               1.1F                                           ///< Maximum reservoir recirculation limit <= 400mL/m.
 #define MAX_RESERVOIR_RECIRCULATION_450_MLP               1.15F                                          ///< Maximum reservoir recirculation limit <= 450mL/m.
@@ -58,11 +58,6 @@
 #define TGT_FILL_FLOW_800_ML_PER_MIN                      0.8F                                           ///< Target fill flow rate 800 mL/min.
 #define TGT_FILL_FLOW_ERROR_ALLOWANCE                     0.9F                                           ///< Target fill flow rate for dialysate allowed error percentage.
 
-#define DIA_FLOW_TO_FILL_FLOW_SECOND_ORDER_COEFF          10.0F                                          ///< Dialysate flow rate to fill flow rate second order coefficient.
-#define DIA_FLOW_TO_FILL_FLOW_FIRST_ORDER_COEFF           7.5F                                           ///< Dialysate flow rate to fill flow rate first order coefficient.
-#define DIA_FLOW_TO_FILL_FLOW_CONSTANT                    2.0F                                           ///< Dialysate flow rate to fill flow rate constant.
-
-#define MAX_RESERVOIR_VOL_BEFORE_SWITCH_ML                1900.0F                                        ///< Maximum reservoir volume before we switch reservoirs (in mL).
 #define FILL_VOLUME_INTERCEPT_ML_QD_ABOVE_400_MLPM        1100                                           ///< Fill volume intercept in milliliters for Qd above 400 mL/min.
 
 // ********** private data **********
@@ -540,7 +535,9 @@
     // Check if the dilution level has exceeded the limit or the spent volume is more than the amount of volume in the reservoir
     // If it has, trigger the fill command. This if should not happen and the predictive dilution level should trigger just in time
     // in advance
-    if ( ( dilutionLevelPct >= MAX_RESERVOIR_DILUTION ) || ( volSpentML >= (F32)prevTargetFillVolumeML[ activeRsrvr ] ) )
+    if ( ( dilutionLevelPct >= MAX_RESERVOIR_DILUTION ) ||
+         ( volSpentML >= (F32)prevTargetFillVolumeML[ activeRsrvr ] ) ||
+         ( TRUE == isAlarmActive( ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE ) ) )
     {
         if ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode )
         {
@@ -611,10 +608,6 @@
     // Check if DG has moved out of the fill mode
     if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
     {
-        // Clear any of the recoverable conditions in case they were raised during the fill or wait to fill
-        clearAlarmCondition( ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE );
-        clearAlarmCondition( ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE );
-
         reservoirSwitchStartTimeMS = getMSTimerCount();
         state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_FILL_SETTLE_STATE;
     }
@@ -659,9 +652,13 @@
         // Signal dialysis sub-mode to switch reservoirs
         signalReservoirsSwitched();
 
-        // Get ready for the next delivery
+        // Reset spent volume for fresh reservoir that we've just switched to
         volSpentML = 0.0;
 
+        // Clear any of the recoverable conditions that were waiting for reservoir switch to allow treatment resume
+        clearAlarmCondition( ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE );
+        clearAlarmCondition( ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE );
+
         // Wait for used reservoir to settle
         reservoirSwitchStartTimeMS = getMSTimerCount();