Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -re044317c454510482d8a04da1f78cff380a6e7d1 -rfae5ed2aeb0f330868f37ff37dd49cb29e5476f2
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision e044317c454510482d8a04da1f78cff380a6e7d1)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision fae5ed2aeb0f330868f37ff37dd49cb29e5476f2)
@@ -353,9 +353,17 @@
     //Turn on air pump if fluid reaches upper level.
     else if ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
     {
-        setValveAirTrap( STATE_OPEN );
-        fillStartTime = getMSTimerCount();
-        result = AIR_TRAP_VALVE_OPEN_STATE;
+#ifndef _RELEASE_
+        if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
+        {
+#endif
+            if ( AIR_PUMP_STATE_OFF == getAirPumpState() )
+            {
+                setAirPumpState( AIR_PUMP_STATE_ON );
+            }
+#ifndef _RELEASE_
+        }
+#endif
     }
     return result;
 }
@@ -384,12 +392,20 @@
         setValveAirTrap( STATE_CLOSED );
         result = AIR_TRAP_VALVE_CLOSED_STATE;
     }
+    // Turn air pump off once we detect air at lower level.
     else if ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) )
     {
-        if ( AIR_PUMP_STATE_ON == getAirPumpState() )
+#ifndef _RELEASE_
+        if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
         {
-            setAirPumpState( AIR_PUMP_STATE_OFF );
+#endif
+            if ( AIR_PUMP_STATE_ON == getAirPumpState() )
+            {
+                setAirPumpState( AIR_PUMP_STATE_OFF );
+            }
+#ifndef _RELEASE_
         }
+#endif
     }
 
     return result;