Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rbb25b54e08fa328452f5d6e3daa2c96578c296bb -r1e22b6ff6f42ddc57ad6c17e56057ab8a3765680
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision bb25b54e08fa328452f5d6e3daa2c96578c296bb)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 1e22b6ff6f42ddc57ad6c17e56057ab8a3765680)
@@ -740,21 +740,26 @@
             }
         }
 
-        // SRSDG 400
-        if ( FALSE == isValueWithinPercentRange( avgBicarbConductivity, BICARB_NORMAL_CONDUCTIVITY, FIVE_PERCENT_FACTOR ) )
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_MIXING_IN_FILL ) != SW_CONFIG_ENABLE_VALUE )
+#endif
         {
-            setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
-            setThisFisrtFillFlag( TRUE );
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgBicarbConductivity, BICARB_NORMAL_CONDUCTIVITY );  // trigger replace bottles alarm #1
-            activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );
-        }
+            // SRSDG 400
+            if ( FALSE == isValueWithinPercentRange( avgBicarbConductivity, BICARB_NORMAL_CONDUCTIVITY, FIVE_PERCENT_FACTOR ) )
+            {
+                setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
+                setThisFisrtFillFlag( TRUE );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgBicarbConductivity, BICARB_NORMAL_CONDUCTIVITY );  // trigger replace bottles alarm #1
+                activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );
+            }
 
-        if ( FALSE == isValueWithinPercentRange( avgAcidConductivity, ACID_NORMAL_CONDUCTIVITY, FIVE_PERCENT_FACTOR ) )
-        {
-            setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
-            setThisFisrtFillFlag( TRUE );
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgAcidConductivity, ACID_NORMAL_CONDUCTIVITY );  // trigger replace bottles alarm #1 then
-            activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );
+            if ( FALSE == isValueWithinPercentRange( avgAcidConductivity, ACID_NORMAL_CONDUCTIVITY, FIVE_PERCENT_FACTOR ) )
+            {
+                setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
+                setThisFisrtFillFlag( TRUE );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgAcidConductivity, ACID_NORMAL_CONDUCTIVITY );  // trigger replace bottles alarm #1 then
+                activateAlarmNoData ( ALARM_ID_CREATING_DIALYSATE_PLEASE_WAIT );
+            }
         }
 
         // Done with this fill. Calculate the average fill flow rate and average temperature