Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r25a6eff69c9371f7a320751adf5359aaf070e5b0 -rd384eb875bc3cb4b41f12249a024072f0f0f29e1
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 25a6eff69c9371f7a320751adf5359aaf070e5b0)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision d384eb875bc3cb4b41f12249a024072f0f0f29e1)
@@ -1055,7 +1055,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
         }
 #endif
         bpMCDir = ( getMeasuredBloodPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r25a6eff69c9371f7a320751adf5359aaf070e5b0 -rd384eb875bc3cb4b41f12249a024072f0f0f29e1
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 25a6eff69c9371f7a320751adf5359aaf070e5b0)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision d384eb875bc3cb4b41f12249a024072f0f0f29e1)
@@ -568,11 +568,11 @@
     if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
     {
         signalBloodPumpHardStop();  // Stop pump immediately
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
+        //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
     }
     else if ( bpOccl < ( OCCLUSION_CLEAR_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
     {
-        clearAlarmCondition( ALARM_ID_OCCLUSION_BLOOD_PUMP );
+        //clearAlarmCondition( ALARM_ID_OCCLUSION_BLOOD_PUMP );
     }
 #endif
 }
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r25a6eff69c9371f7a320751adf5359aaf070e5b0 -rd384eb875bc3cb4b41f12249a024072f0f0f29e1
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 25a6eff69c9371f7a320751adf5359aaf070e5b0)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision d384eb875bc3cb4b41f12249a024072f0f0f29e1)
@@ -486,6 +486,7 @@
  *************************************************************************/
 void transitionToWetSelfTests()
 {
+    signalDialInPumpHardStop();   // turn off DPi that was on in previous dialysate bypass state
     wetSelfTestsResult = FALSE;
     currentWetSelfTestsState = WET_SELF_TESTS_START_STATE;
     settleStartTime = 0;
@@ -830,10 +831,10 @@
     {
         state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
+//    else
+//    {
+//        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
+//    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {