Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r5f94e4cea043e6458ed80570cdcab0fe6e437bde -rfc0b866a666b5e672eae00b42fe17405fa910843
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 5f94e4cea043e6458ed80570cdcab0fe6e437bde)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision fc0b866a666b5e672eae00b42fe17405fa910843)
@@ -100,7 +100,7 @@
 static PRE_TREATMENT_RESERVOIR_VAR_T reservoirStatus[ NUM_OF_DG_RESERVOIRS ];   ///< Detailed state of each reservoir.
 
 #ifndef _RELEASE_
-const  PRE_TREATMENT_RESERVOIR_VAR_T reservoirPrimingDisabled = {FALSE,FALSE,FALSE,FALSE,FALSE,(0)};
+const  PRE_TREATMENT_RESERVOIR_VAR_T reservoirPrimingDisabled = {FALSE,FALSE,FALSE,TRUE,FALSE,(0)};
 #endif
 const  PRE_TREATMENT_RESERVOIR_VAR_T reservoirPretreatmentInit = {FALSE,FALSE,FALSE,FALSE,FALSE,PRE_TREATMENT_FLUSH_COUNT};
 
@@ -1163,23 +1163,23 @@
     {
         state = PRE_TREATMENT_RESERVOIR_MGMT_REQUEST_RESERVOIR_SWITCH_STATE;
 
-        // Start tracking flush cycles, flushComplete => don't drain again.
-        if ( FALSE == reservoirStatus[ inactiveReservoir ].flushComplete )
+        // Start tracking flush cycles, flushComplete => don't drain again, this completes the final fill.
+        if ( FALSE == reservoirStatus[ activeReservoir ].flushComplete )
         {
-            if ( 0 < reservoirStatus[ inactiveReservoir ].flushCount )
+            if ( 0 < reservoirStatus[ activeReservoir ].flushCount )
             {
-                reservoirStatus[ inactiveReservoir ].flushCount -= 1;
+                reservoirStatus[ activeReservoir ].flushCount -= 1;
             }
-            if ( 0 == reservoirStatus[ inactiveReservoir ].flushCount )
+            if ( 0 == reservoirStatus[ activeReservoir ].flushCount )
             {
-                reservoirStatus[ inactiveReservoir ].flushComplete = TRUE;
+                reservoirStatus[ activeReservoir ].flushComplete = TRUE;
             }
         }
 
         if ( ( TRUE == reservoirStatus[ DG_RESERVOIR_1 ].flushComplete ) &&
              ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].flushComplete ) )
         {
-               reservoirStatus[ activeReservoir ].fillComplete = TRUE;
+               reservoirStatus[ inactiveReservoir ].fillComplete = TRUE;
 
                if ( ( TRUE == reservoirStatus[ DG_RESERVOIR_1 ].fillComplete ) &&
                     ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].fillComplete ) )