Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r63e00142f31734fa1dfcba6503af7072ee5fda6b -r6df491d298cef30e312b930e9d3b4e81ce0ec946
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 63e00142f31734fa1dfcba6503af7072ee5fda6b)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 6df491d298cef30e312b930e9d3b4e81ce0ec946)
@@ -667,7 +667,7 @@
         }
 #endif
 
-        if ( TRUE == isConductivityInRange )
+        if ( ( TRUE == isConductivityInRange ) || ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
         {
             // Initialization
             requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
@@ -738,7 +738,8 @@
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACID_CONDUCTIVITY_TEST ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            if ( TRUE == isValueWithinPercentRange( averageAcidConductivity, acidCondUSPerCM, FIVE_PERCENT_FACTOR ) )
+            if ( ( TRUE == isValueWithinPercentRange( averageAcidConductivity, acidCondUSPerCM, FIVE_PERCENT_FACTOR ) ) ||
+                 ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
             {
                 hasAcidTestPassed = TRUE;
             }
@@ -747,7 +748,7 @@
                 SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DG_ACID_CONDUCTIVITY_OUT_OF_RANGE, averageAcidConductivity )
             }
 
-            if ( pctDiffInConductivity < FIVE_PERCENT_FACTOR )
+            if ( ( pctDiffInConductivity < FIVE_PERCENT_FACTOR ) || ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
             {
                 hasCD1CD2TestPassed = TRUE;
             }
@@ -933,7 +934,7 @@
                 F32 avgCPo = sumFillCPoConductivity / (F32)fillCPoConductivitySampleCnt;  // sample count incremented above w/o condition so no need for divide by zero checks
                 F32 avgRR  = sumFillRejRatio / (F32)fillCPoConductivitySampleCnt;
 
-                if ( avgCPo > MAX_CPO_CONDUCTIVITY_ALLOW )
+                if ( ( avgCPo > MAX_CPO_CONDUCTIVITY_ALLOW ) || ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
                 {
                     // Fault alarm per PRS 483
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE, avgCPo, MAX_CPO_CONDUCTIVITY_ALLOW );
@@ -963,7 +964,8 @@
 #endif
         {
             // SRSDG 400
-            if ( FALSE == isValueWithinPercentRange( avgBicarbConductivity, bicarbNormalConductivity, FIVE_PERCENT_FACTOR ) )
+            if ( ( FALSE == isValueWithinPercentRange( avgBicarbConductivity, bicarbNormalConductivity, FIVE_PERCENT_FACTOR ) ) ||
+                 ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
@@ -972,7 +974,8 @@
                 activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
             }
 
-            if ( FALSE == isValueWithinPercentRange( avgAcidConductivity, acidNormalConductivity, FIVE_PERCENT_FACTOR ) )
+            if ( ( FALSE == isValueWithinPercentRange( avgAcidConductivity, acidNormalConductivity, FIVE_PERCENT_FACTOR ) ) ||
+                 ( getReleaseSoftwareConfigStatus( RELEASE_SW_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ))
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
@@ -1046,13 +1049,13 @@
     checkInletWaterPressure();
 
     // Check if any of the alarms are active
-    if ( ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) )        ||
-         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) )       ||
-         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )        ||
-         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )         ||
-         ( TRUE == isAlarmActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE ) )  ||
-         ( TRUE == isAlarmActive( ALARM_ID_DG_RO_REJECTION_RATIO_OUT_OF_RANGE ) )              ||
-         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) )           ||
+    if ( ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE ) )    ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE ) )   ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) )    ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) )     ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE ) ) ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_RO_REJECTION_RATIO_OUT_OF_RANGE ) )          ||
+         ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE ) )       ||
          ( TRUE == isAlarmActive( ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE ) ) )
     {
         status = TRUE;