Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rb3034747b23029d9ab2b63cf5029f0bf54cf7bb9 -r25dee0c0e9d32ad4b18f0c5e6a0e9400869b54d2
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision b3034747b23029d9ab2b63cf5029f0bf54cf7bb9)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 25dee0c0e9d32ad4b18f0c5e6a0e9400869b54d2)
@@ -1233,13 +1233,18 @@
     PRE_TREATMENT_RESERVOIR_MGMT_STATE_T state = PRE_TREATMENT_RESERVOIR_MGMT_REQUEST_RESERVOIR_SWITCH_STATE;
     DG_OP_MODE_T dgOpMode = getDGOpMode();
     U32 dgSubMode = getDGSubMode();
+    BOOL waitBeforeSwitch = TRUE;
 
     //wait after drain or fill
     if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
     {
-        BOOL waitBeforeSwitch = TRUE;
-
         // We do not want to switch over to res 2 final fill until prime is ready for it.
+#ifndef _RELEASE_
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
+        {
+            waitBeforeSwitch = FALSE;
+        }
+#endif
         if ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].fillComplete )
         {
             if ( ( getPreTreatmentSubState() > HD_PRE_TREATMENT_PRIME_STATE ) ||