Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -re5d1d67106a93a6cd1b5692b586625d715732e2f -r9b3f49e024c38a2a7aad8dbe383b3b6ab0e733f2
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision e5d1d67106a93a6cd1b5692b586625d715732e2f)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 9b3f49e024c38a2a7aad8dbe383b3b6ab0e733f2)
@@ -82,8 +82,18 @@
  *************************************************************************/
 void initAirTrap( void )
 {
+    U32 i;
+
     resetAirTrap();
     airTrapIllegalLevelSensorsCtr = 0;
+
+    for ( i = 0; i < NUM_OF_AIR_TRAP_LEVEL_SENSORS; i++ )
+    {
+        airTrapLevels[i].data = 0;
+        airTrapLevels[i].ovData = 0;
+        airTrapLevels[i].ovInitData = 0;
+        airTrapLevels[i].override = OVERRIDE_RESET;
+    }
 }
 
 /*********************************************************************//**
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r4a86e82fceb9056cb5b2c7dec1b465698104ca61 -r9b3f49e024c38a2a7aad8dbe383b3b6ab0e733f2
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 4a86e82fceb9056cb5b2c7dec1b465698104ca61)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 9b3f49e024c38a2a7aad8dbe383b3b6ab0e733f2)
@@ -62,22 +62,24 @@
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART
     #define ALARM_VOLUME_DEFAULT_LOW        1           // Set default alarm volume to lowest
-    #define TEMP_UI_ALARM_SILENCE_FIX       1           // Temporary UI fix for handling alarm silence request msg
-    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+//    #define TEMP_UI_ALARM_SILENCE_FIX       1           // Temporary UI fix for handling alarm silence request msg
+//    #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
     #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
 //    #define V1_5_SYSTEM                     1           // Build for v1.5 system
 //    #define V2_0_SYSTEM                     1           // Build for v2.0 system
-    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
+//    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
     #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
     #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
-    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
+//    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
 //    #define DISABLE_BATT_COMM               1           // Disable battery communication.
     #define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.
     #define DISABLE_OCCLUSION_SELF_TEST     1           // Skip occlusion sensor self-test.
+//    #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check
+    #define SKIP_EMPTY_RES_CHECK            1           // Skip reservoir empty check
     #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
     #define DISABLE_VOLTAGE_MONITOR         1           // Disable voltage monitoring/alarms
     #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute
-//    #define SLOW_SYRINGE_RETRACT            1           // Slow retract speed to reduce chance of stall
+    #define SLOW_SYRINGE_RETRACT            1           // Slow retract speed to reduce chance of stall
     #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
 
     #include <stdio.h>