Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r1a219888b8fda9dcbbfc51fbe76490ee247f5f14 -rf10c653a13f97ae3d220e16f7ff1a9558606b56a
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 1a219888b8fda9dcbbfc51fbe76490ee247f5f14)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision f10c653a13f97ae3d220e16f7ff1a9558606b56a)
@@ -309,15 +309,17 @@
 #endif
         {
             // Detect empty bottles using integrated volumes
-            if ( ( acidBottleVolML - getChemicalUsedVolumeML( ACID ) ) <= CONCENTRATE_BOTTLE_ACID_LOW_VOLUME_ML ) // SRSDG 836
+            if ( ( ( acidBottleVolML - getChemicalUsedVolumeML( ACID ) ) <= CONCENTRATE_BOTTLE_ACID_LOW_VOLUME_ML ) && // SRSDG 836
+                 ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
             {
                 resetChemicalUsedVolumeML( ACID );
                 setThisFisrtFillFlag( TRUE );                                 // indicates bottles need prime
                 activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );
                 activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
             }
 
-            if ( ( bicarbBottleVolML - getChemicalUsedVolumeML( BICARB ) ) <= CONCENTRATE_BOTTLE_BICARB_LOW_VOLUME_ML )  // SRSDG 837
+            if ( ( ( bicarbBottleVolML - getChemicalUsedVolumeML( BICARB ) ) <= CONCENTRATE_BOTTLE_BICARB_LOW_VOLUME_ML ) &&  // SRSDG 837
+                 ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
             {
                 resetChemicalUsedVolumeML( BICARB );
                 setThisFisrtFillFlag( TRUE );
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r8ee01698b926fa62e7bed563b1137144a3cb32c5 -rf10c653a13f97ae3d220e16f7ff1a9558606b56a
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 8ee01698b926fa62e7bed563b1137144a3cb32c5)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision f10c653a13f97ae3d220e16f7ff1a9558606b56a)
@@ -240,7 +240,7 @@
     // Set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-#ifdef 0
+#if 0
     // Reset the state machine
     // Note: the substate timers, and operation flags need to be reset on recovery, consider
     //       reinitializing the state variables, the resetting the state, by calling setModeFillStateTransition()