Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r32763ee524dc476f47ba41ee6c2a8a0c65ebf1e1 -r20f69d01f2a252eeef3d936dc0983491eb2e7a3d
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 32763ee524dc476f47ba41ee6c2a8a0c65ebf1e1)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 20f69d01f2a252eeef3d936dc0983491eb2e7a3d)
@@ -7,8 +7,8 @@
 *
 * @file    AirTrap.c
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      02-Mar-2026
+* @author  (last)      Praneeth Bunne
+* @date    (last)      13-Mar-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  24-Oct-2024
@@ -26,6 +26,7 @@
 #include "Pressures.h"
 #include "Switches.h"
 #include "TaskGeneral.h"
+#include "TestSupport.h"
 #include "Timers.h"
 #include "Utilities.h"
 #include "Valve3Way.h"
@@ -399,7 +400,11 @@
         pendingStopAirTrapController = FALSE;
         result = AIR_TRAP_MANUAL_CONTROL_STATE;
     }
-
+    // Skip fill and lower level events when no tubing set is installed
+    else if ( TRUE == getTestConfigStatus( TEST_CONFIG_TESTING_WITHOUT_TUBING_SET ) )
+    {
+        result = AIR_TRAP_CLOSED_STATE;
+    }
     // Lower air trap level if fluid reaches upper level.
     else if ( AIR_TRAP_LEVEL_FLUID == getLevelSensorState( H16_LEVL ) )
     {
@@ -427,7 +432,6 @@
             result = AIR_TRAP_LOWER_LEVEL_STATE;
         }
     }
-
     // Raise air trap level once at start of treatment (blood priming) or when air detected at lower level
     else if ( ( airTrapWasFilledAtStartOfTreatement != TRUE ) ||
               ( AIR_TRAP_LEVEL_AIR == getLevelSensorState( H17_LEVL ) ) )
Index: firmware/App/Monitors/Pressures.c
===================================================================
diff -u -rb017f10001f67282ab6622e34d629ae2f884cdc9 -r20f69d01f2a252eeef3d936dc0983491eb2e7a3d
--- firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision b017f10001f67282ab6622e34d629ae2f884cdc9)
+++ firmware/App/Monitors/Pressures.c	(.../Pressures.c)	(revision 20f69d01f2a252eeef3d936dc0983491eb2e7a3d)
@@ -200,7 +200,7 @@
 static U32 tmpPressureReadingsLongCount;                                        ///< Number of samples in flow rolling average buffer.
 
 static PRESSURE_SELF_TEST_STATE_T pressurePostState;                            ///< Pressure self test post state.
-//static HD_PRESSURE_SENSORS_CAL_RECORD_T pressureSensorsCalRecord;               ///< Pressure sensors calibration record.
+//static HD_PRESSURE_SENSORS_CAL_RECORD_T pressureSensorsCalRecord;             ///< Pressure sensors calibration record.
 
 // ********** private function prototypes **********
 
Index: firmware/App/Services/FpgaTD.c
===================================================================
diff -u -r291d652fcd09b461728962a547d3b08163737d76 -r20f69d01f2a252eeef3d936dc0983491eb2e7a3d
--- firmware/App/Services/FpgaTD.c	(.../FpgaTD.c)	(revision 291d652fcd09b461728962a547d3b08163737d76)
+++ firmware/App/Services/FpgaTD.c	(.../FpgaTD.c)	(revision 20f69d01f2a252eeef3d936dc0983491eb2e7a3d)
@@ -1291,6 +1291,18 @@
 
 /*********************************************************************//**
  * @brief
+ * The getAirPumpRPM function reads the air pump RPM from FPGA.
+ * @details \b Inputs: fpgaSensorReadings
+ * @details \b Outputs: none
+ * @return air pump RPM value
+ *************************************************************************/
+U16 getAirPumpRPM( void )
+{
+    return fpgaSensorReadings.h12Speed;
+}
+
+/*********************************************************************//**
+ * @brief
  * The checkFPGACommFailure function increments the FPGA comm failure
  * windowed timer and returns whether or not the number of failures in
  * the window have been reached.
Index: firmware/App/Services/FpgaTD.h
===================================================================
diff -u -r291d652fcd09b461728962a547d3b08163737d76 -r20f69d01f2a252eeef3d936dc0983491eb2e7a3d
--- firmware/App/Services/FpgaTD.h	(.../FpgaTD.h)	(revision 291d652fcd09b461728962a547d3b08163737d76)
+++ firmware/App/Services/FpgaTD.h	(.../FpgaTD.h)	(revision 20f69d01f2a252eeef3d936dc0983491eb2e7a3d)
@@ -147,6 +147,7 @@
 U16  getFPGABoardTemperature( void );
 U32  getFPGAPBAADCTemperature( void );
 U16  getFPGAInletFan1TogglePeriod( void );
+U16  getAirPumpRPM( void );
 
 BOOL getH9FrontDoorClosedStatus( void );
 U32 getFPGAEjectorRetractOpticalSensor( void );
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r0c7c63920907a0c34c4878a8ce8638070e4d14a3 -r20f69d01f2a252eeef3d936dc0983491eb2e7a3d
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0c7c63920907a0c34c4878a8ce8638070e4d14a3)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 20f69d01f2a252eeef3d936dc0983491eb2e7a3d)
@@ -177,6 +177,7 @@
     { MSG_ID_TD_HARD_STOP_BLOOD_PUMP,                                   &testHardStopBloodPump },
     { MSG_ID_TD_AIR_PUMP_POWER_RAISE_OVERRIDE_REQUEST,                  &testAirPumpPowerRaiseOverride },
     { MSG_ID_TD_AIR_PUMP_POWER_LOWER_OVERRIDE_REQUEST,                  &testAirPumpPowerLowerOverride },
+    { MSG_ID_TD_HARD_STOP_BLOOD_PUMP,                                   &testHardStopBloodPump },
     { MSG_ID_TD_BARO_MFG_CRC_OVERRIDE,                                  &testBaroPressureMFGCRCOverride },
     { MSG_ID_TD_BARO_PRESSURE_OVERRIDE,                                 &testBaroPressureOverride },
     { MSG_ID_TD_TEMPERATURE_OVERRIDE,                                   &testTemperatureOverride },
Index: firmware/App/TDCommon.h
===================================================================
diff -u -r1869ca4d2dc086fd3e6617f435fdfc495e05d538 -r20f69d01f2a252eeef3d936dc0983491eb2e7a3d
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 1869ca4d2dc086fd3e6617f435fdfc495e05d538)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 20f69d01f2a252eeef3d936dc0983491eb2e7a3d)
@@ -25,7 +25,7 @@
 #define TD_VERSION_MAJOR        0
 #define TD_VERSION_MINOR        0
 #define TD_VERSION_MICRO        0
-#define TD_VERSION_BUILD  36
+#define TD_VERSION_BUILD  63
 
 // ********** development build switches **********