Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r18a83ba64d9560ce8c4c009560ec1391ae15102f -r00b244580f01f3cbd1b7d2d5a14ee61675bf4642
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 18a83ba64d9560ce8c4c009560ec1391ae15102f)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 00b244580f01f3cbd1b7d2d5a14ee61675bf4642)
@@ -626,6 +626,12 @@
         if ( TRUE == isThisTheFirstFill() )
         {
             result = DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES;
+
+            if ( TRUE == getTestConfigStatus( TEST_CONFIG_EXPEDITE_PRE_TREATMENT ) )
+            {
+                // If expedite pre-treatment flag is enabled, do not do the initial fill
+                result = DG_FILL_MODE_STATE_PRODUCE_DIALYSATE;
+            }
         }
         else
         {