Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r721bd715bef050760e5c0f79044d1cba642c8354 -r4ca9ae0989215af5b543637dc4b435f8b38480d2
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 721bd715bef050760e5c0f79044d1cba642c8354)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 4ca9ae0989215af5b543637dc4b435f8b38480d2)
@@ -626,6 +626,12 @@
         if ( TRUE == isThisTheFirstFill() )
         {
             result = DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES;
+
+            if ( TRUE == getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) )
+            {
+                // If expedite pre-treatment flag is enabled, do not do the initial fill
+                result = DG_FILL_MODE_STATE_PRODUCE_DIALYSATE;
+            }
         }
         else
         {