Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r685e17a553a4fdf7dd8b3715e95d151eeff3c866 -r5aaca3e9292c6c7404872440fe2ebe8ac6641fb8
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 685e17a553a4fdf7dd8b3715e95d151eeff3c866)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 5aaca3e9292c6c7404872440fe2ebe8ac6641fb8)
@@ -1060,7 +1060,9 @@
         if ( lastBloodPumpDirectionCount != dirErrorCnt )
         {
             lastBloodPumpDirectionCount = dirErrorCnt;
+#ifndef DISABLE_PUMP_DIRECTION_CHECKS
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_BLOOD_PUMP )
+#endif
         }
 
         bpMCDir = ( getMeasuredBloodPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r88e0f56fa5eb3af397fee7cebb49efdab54f8491 -r5aaca3e9292c6c7404872440fe2ebe8ac6641fb8
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 88e0f56fa5eb3af397fee7cebb49efdab54f8491)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 5aaca3e9292c6c7404872440fe2ebe8ac6641fb8)
@@ -843,10 +843,10 @@
 {
     TREATMENT_STATE_T result = TREATMENT_RINSEBACK_STATE;
 
-    // Execute treatment re-circ sub-mode
+    // Execute treatment rinseback sub-mode
     execRinseback();
 
-    // Handle signals from treatment end sub-mode
+    // Handle signals from rinseback sub-mode
     if ( TRUE == rinsebackToRecircRequest )
     {
         transitionToTreatmentRecirc();
@@ -880,7 +880,7 @@
     // Execute treatment re-circ sub-mode
     execTreatmentRecirc();
 
-    // Handle signals from treatment end sub-mode
+    // Handle signals from treatment re-circ sub-mode
     if ( TRUE == rinsebackToStoppedRequest )
     {
         transitionToTreatmentStop();
@@ -1463,8 +1463,8 @@
 
     if ( timeElapsedSinceLastCollect_ms >= TREATMENT_PERIODIC_DATA_LOG_INTERVAL )
     {
-        F32 const arterialPres = getMeasuredArterialPressure();
-        F32 const venousPres = getMeasuredArterialPressure();
+        F32 const arterialPres = getFilteredArterialPressure();
+        F32 const venousPres = getFilteredVenousPressure();
 
         lastTreatmentPeriodicDataCollectTimeStamp = treatmentTimeMS;
         bloodFlowRateSum_mL_min += getMeasuredBloodFlowRate();
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r88e0f56fa5eb3af397fee7cebb49efdab54f8491 -r5aaca3e9292c6c7404872440fe2ebe8ac6641fb8
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 88e0f56fa5eb3af397fee7cebb49efdab54f8491)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 5aaca3e9292c6c7404872440fe2ebe8ac6641fb8)
@@ -848,8 +848,8 @@
     }
     else
     {
-        previousNormalArterialPressure = getMeasuredArterialPressure();
-        previousNormalVenousPressure = getMeasuredVenousPressure();
+        previousNormalArterialPressure = getFilteredArterialPressure();
+        previousNormalVenousPressure = getFilteredVenousPressure();
 
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
@@ -875,8 +875,8 @@
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsState( SELF_TEST_STATUS_T *result )
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_STATE;
-    F32 const arterialPressure = getMeasuredArterialPressure();
-    F32 const venousPressure = getMeasuredVenousPressure();
+    F32 const arterialPressure = getFilteredArterialPressure();
+    F32 const venousPressure = getFilteredVenousPressure();
 
     // End the test when reaching target pressure or time out
     if ( ( TRUE == didTimeout( pressureSelfTestBloodPumpRunStartTime, BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST ) ) ||
@@ -919,8 +919,8 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE;
 
-    F32 const arterialPressureDiff = fabs( getMeasuredArterialPressure() - previousNormalArterialPressure );
-    F32 const venousPressureDiff = fabs( getMeasuredVenousPressure() - previousNormalVenousPressure );
+    F32 const arterialPressureDiff = fabs( getFilteredArterialPressure() - previousNormalArterialPressure );
+    F32 const venousPressureDiff = fabs( getFilteredVenousPressure() - previousNormalVenousPressure );
 
     if ( TRUE == didTimeout( pressureSelfTestNormalizedStartTime, NORMALIZED_PRESSURE_SELF_TEST_TIME ) )
     {