Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r2bb3eb5316eef6a7eccf41f8815de100aa6abee7 -r6bb7cd715299d16c131ab074fac0e62d8022f235
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 2bb3eb5316eef6a7eccf41f8815de100aa6abee7)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 6bb7cd715299d16c131ab074fac0e62d8022f235)
@@ -359,7 +359,7 @@
         checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, isRPMTooHigh, getDrainPumpMeasuredRPM(), MIN_DRAIN_PUMP_RPM );
 
         // If the off fault alarm has become active, trigger the safety shutdown
-        if ( isAlarmActive( ALARM_ID_DRAIN_PUMP_OFF_FAULT ) )
+        if ( TRUE == isAlarmActive( ALARM_ID_DRAIN_PUMP_OFF_FAULT ) )
         {
             activateSafetyShutdown();
         }
Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -r94a190522ce398399c7b93c59f788d7666ec0060 -r6bb7cd715299d16c131ab074fac0e62d8022f235
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 94a190522ce398399c7b93c59f788d7666ec0060)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 6bb7cd715299d16c131ab074fac0e62d8022f235)
@@ -55,7 +55,7 @@
     F32 targetTemp;                         ///< Target temperature for heater
 } TRIMMER_HEATER_CMD_T;
 
-/// Heaters data struct.
+/// Heaters data structure.
 typedef struct
 {
     F32 mainPrimayHeaterDC;                 ///< Main primary heater DC
Index: firmware/App/DGCommon.h
===================================================================
diff -u -r2bb3eb5316eef6a7eccf41f8815de100aa6abee7 -r6bb7cd715299d16c131ab074fac0e62d8022f235
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 2bb3eb5316eef6a7eccf41f8815de100aa6abee7)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 6bb7cd715299d16c131ab074fac0e62d8022f235)
@@ -47,16 +47,16 @@
 //    #define IGNORE_HEATERS_MONITOR          1
     #define IGNORE_RO_PUMP_MONITOR          1
     #define DISABLE_RO_RATIO_CHECK          1
-//    #define DISABLE_COND_SENSOR_CHECK       1
-    #define DISABLE_WATER_QUALITY_CHECK     1
+    #define DISABLE_COND_SENSOR_CHECK       1    // Disabled for Tom
+    #define DISABLE_WATER_QUALITY_CHECK     1    // Disabled for Tom
     #define DISABLE_RTC_CONFIG              1
     #define THD_USING_TRO_CONNECTOR         1
     #define DISABLE_FLOW_CHECK_IN_FILL      1
     #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1
 //    #define NEW_FMD_FLOW_SENSOR             1
 
     // Turn these flags on to disable dialysate mixing
-    #define DISABLE_DIALYSATE_CHECK         1
+    #define DISABLE_DIALYSATE_CHECK         1  // Disabled for Tom
     #define DISABLE_MIXING                  1
     //#define DISABLE_FLOW_CONTROL_TREATMENT  1
     #define DISABLE_ACK_ALARM 1
Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -r94a190522ce398399c7b93c59f788d7666ec0060 -r6bb7cd715299d16c131ab074fac0e62d8022f235
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 94a190522ce398399c7b93c59f788d7666ec0060)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 6bb7cd715299d16c131ab074fac0e62d8022f235)
@@ -86,7 +86,8 @@
  *************************************************************************/
 void activateSafetyShutdown( void )
 {
-    SET_SAFETY_SHUTDOWN();
+    SET_SAFETY_SHUTDOWN();
+    safetyShutdownActivated = TRUE;
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r1aeab08c1baf6445514b81fe51fc60a3e536e782 -r6bb7cd715299d16c131ab074fac0e62d8022f235
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 1aeab08c1baf6445514b81fe51fc60a3e536e782)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 6bb7cd715299d16c131ab074fac0e62d8022f235)
@@ -270,9 +270,9 @@
     // Publish voltages monitor data on interval
     if ( ++alarmInfoPublicationTimerCounter >= getU32OverrideValue( &alarmInfoPublishInterval ) )
     {
-        BOOL safetyActivated = isSafetyShutdownActivated();
+        U32 safetyActivated = (U32)isSafetyShutdownActivated();
 
-        broadcastData( MSG_ID_DG_ALARM_INFO, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&safetyActivated, sizeof( BOOL ) );
+        broadcastData( MSG_ID_DG_ALARM_INFO, COMM_BUFFER_OUT_CAN_DG_ALARM, (U08*)&safetyActivated, sizeof( U32 ) );
         alarmInfoPublicationTimerCounter = 0;
     }
 }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1aeab08c1baf6445514b81fe51fc60a3e536e782 -r6bb7cd715299d16c131ab074fac0e62d8022f235
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1aeab08c1baf6445514b81fe51fc60a3e536e782)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6bb7cd715299d16c131ab074fac0e62d8022f235)
@@ -1702,12 +1702,13 @@
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( 0 == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetSafetyShutdownOverride( payload.state.u32 );
+            U32 command = 1;
+            result = testSetSafetyShutdownOverride( command );
         }
         else
         {