Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rbcabc6be0c3b6cc916d1c7f9b0983082834870ca -rfc5a7684ab48a9c7f68dccd469e59daad9fd0a83
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision bcabc6be0c3b6cc916d1c7f9b0983082834870ca)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision fc5a7684ab48a9c7f68dccd469e59daad9fd0a83)
@@ -228,7 +228,9 @@
 
         if ( TRUE == didTimeout( fillStartTime, fillTimeoutMS ) )
         {
+#ifndef DISABLE_AIR_TRAP_LEVELING
             activateAlarmNoData( ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT );
+#endif
         }
     }
 }
Index: firmware/App/HDCommon.h
===================================================================
diff -u -ra5b2f7f58ed39bd84d2ba6986850cae7feddfeb4 -rfc5a7684ab48a9c7f68dccd469e59daad9fd0a83
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision a5b2f7f58ed39bd84d2ba6986850cae7feddfeb4)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision fc5a7684ab48a9c7f68dccd469e59daad9fd0a83)
@@ -40,6 +40,7 @@
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes alarm lamp pins for task timing
     #define SKIP_POST                       1           // skip POST tests - all pass
 //    #define LIMITED_NVDATA_CRC_CHECKS       1           // only perform POST CRC checks on nv-data records that are implemented so far
+    #define DISABLE_AIR_TRAP_LEVELING       1           // disable air trap level control
 //    #define DISABLE_3WAY_VALVES             1           // disable 3-way valves
 //    #define TST_3WAY_VALVES_ALWAYS_OPEN     1           // after POST and homing, open all 4 valves
     #define DISABLE_ACCELS                  1           // disable accelerometer POST and monitoring
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -ra5b2f7f58ed39bd84d2ba6986850cae7feddfeb4 -rfc5a7684ab48a9c7f68dccd469e59daad9fd0a83
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision a5b2f7f58ed39bd84d2ba6986850cae7feddfeb4)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision fc5a7684ab48a9c7f68dccd469e59daad9fd0a83)
@@ -23,13 +23,14 @@
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
 #include "Dialysis.h"
-#include "TaskGeneral.h"
+#include "ModeTreatment.h"
+#include "ModeTreatmentParams.h"
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
+#include "TaskGeneral.h"
 #include "Timers.h"
 #include "TreatmentStop.h"
 #include "Valves.h"
-#include "ModeTreatment.h"
 #ifdef RM46_EVAL_BOARD_TARGET
     #include "Timers.h"
     static U32 start;