Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -re1c23ba7cd93c1d63ffdcbd894aa95ac7c39b584 -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision e1c23ba7cd93c1d63ffdcbd894aa95ac7c39b584)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
@@ -123,9 +123,7 @@
     // NOTE: The target flow rate should be set prior to setting the start primary heater
     // because the initial guess in the heaters driver needs the target flow to calculate
     // the new PWMs for the main and small primary heaters
-#ifndef DISABLE_FLOW_CONTROL_TREATMENT
     setROPumpTargetFlowRateLPM( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
-#endif
     setHeaterTargetTemperature( DG_PRIMARY_HEATER, getPrimaryHeaterTargetTemperature() );
     startHeater( DG_PRIMARY_HEATER );
 
@@ -248,22 +246,25 @@
             setValveState( VRD2, VALVE_STATE_CLOSED );
         }
 
-#ifndef DISABLE_EMPTY_BOTTLES_ALARMS
-        // Detect empty bottles using integrated volumes
-        if ( ( ACID_CONCENTRATION_BOTTLE_VOLUME_ML - getChemicalUsedVolumeML( ACID ) ) <= CONCENTRATION_BOTTLE_LOW_VOLUME_ML ) // ||  // SRSDG 437
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_EMPTY_BOTTLES_ALARM ) != SW_CONFIG_ENABLE_VALUE )
+#endif
         {
-            resetChemicalUsedVolumeML( ACID );
-            setThisFisrtFillFlag( TRUE );                                 // indicates bottles need prime
-            activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );
-        }
+            // Detect empty bottles using integrated volumes
+            if ( ( ACID_CONCENTRATION_BOTTLE_VOLUME_ML - getChemicalUsedVolumeML( ACID ) ) <= CONCENTRATION_BOTTLE_LOW_VOLUME_ML ) // ||  // SRSDG 437
+            {
+                resetChemicalUsedVolumeML( ACID );
+                setThisFisrtFillFlag( TRUE );                                 // indicates bottles need prime
+                activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );
+            }
 
-        if ( ( BICARB_CONCENTRATION_BOTTLE_VOLUME_ML - getChemicalUsedVolumeML( BICARB ) ) <= CONCENTRATION_BOTTLE_LOW_VOLUME_ML )  // || // SRSDG 438
-        {
-            resetChemicalUsedVolumeML( BICARB );
-            setThisFisrtFillFlag( TRUE );
-            activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
+            if ( ( BICARB_CONCENTRATION_BOTTLE_VOLUME_ML - getChemicalUsedVolumeML( BICARB ) ) <= CONCENTRATION_BOTTLE_LOW_VOLUME_ML )  // || // SRSDG 438
+            {
+                resetChemicalUsedVolumeML( BICARB );
+                setThisFisrtFillFlag( TRUE );
+                activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
+            }
         }
-#endif
 
         if ( TRUE == isReservoirTarePending() )
         {   // Tare reservoir load cells at empty if requested