Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rb67373adbc581690febb1e1c2bb521f108d9b92e -rd371983d84daf213db3e39d21cf30c13161ce062
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision b67373adbc581690febb1e1c2bb521f108d9b92e)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision d371983d84daf213db3e39d21cf30c13161ce062)
@@ -7,8 +7,8 @@
 *
 * @file    ModeDrain.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      09-Aug-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      19-Sep-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  20-Dec-2019
@@ -309,18 +309,20 @@
 #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
+                setThisFirstFillFlag( 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 );
+                setThisFirstFillFlag( TRUE );
                 activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
                 activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT );
             }