Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rda0deea71ed5770d98a00943369b9c17321e139f -r704415d4a27cdff6d2cdc9c3641477ee7ccde6af
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision da0deea71ed5770d98a00943369b9c17321e139f)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 704415d4a27cdff6d2cdc9c3641477ee7ccde6af)
@@ -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
         {