Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -re8c019d3d43b517cabfdfe75fa5d03749d036018 -r38c28a43b71d21d72906b07e9d60107b84bffb37
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision e8c019d3d43b517cabfdfe75fa5d03749d036018)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 38c28a43b71d21d72906b07e9d60107b84bffb37)
@@ -183,7 +183,7 @@
         // If this function was called, delayed command does not need to be executed
         // so the pending count down is zeroed.
         pendingDrainPumpCmdCountDown = 0;
-        result = TRUE;
+        result                       = TRUE;
     }
     else
     {
@@ -324,7 +324,7 @@
  *************************************************************************/
 void execDrainPumpMonitor( void )
 {
-    U16 const fpgaADCSpeedCount = getFPGADrainPumpSpeed();
+    U16 fpgaADCSpeedCount = getFPGADrainPumpSpeed();
 
     if ( DRAIN_PUMP_OFF_RPM_ADC_COUNT == fpgaADCSpeedCount )
     {
@@ -346,7 +346,9 @@
             BOOL isRPMTooHigh = ( getDrainPumpMeasuredRPM() > MIN_DRAIN_PUMP_RPM ? TRUE : FALSE );
 
             checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, FALSE, getDrainPumpMeasuredRPM(), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
+#ifndef ENABLE_DVT_BOARD
             checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, isRPMTooHigh, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM ); // TODO DVT
+#endif
 
             // If the off fault alarm has become active, trigger the safety shutdown
             if ( TRUE == isAlarmActive( ALARM_ID_DRAIN_PUMP_OFF_FAULT ) )
@@ -363,8 +365,10 @@
             // Check if RPM is out of range
             BOOL isRPMOutOfRange = ( rpmDiff > MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE ? TRUE : FALSE );
 
+#ifndef ENABLE_DVT_BOARD
             checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, isRPMOutOfRange, getDrainPumpMeasuredRPM(), MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
             checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, FALSE, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM ); // TODO DVT
+#endif
         }
         else
         {