Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rc482b47217e0ea686fe282ff2479f5946bbeaac5 -r2039b2a517f7868280bfb762cd4ff3341edd6c21
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision c482b47217e0ea686fe282ff2479f5946bbeaac5)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 2039b2a517f7868280bfb762cd4ff3341edd6c21)
@@ -1052,7 +1052,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/DialInFlow.c
===================================================================
diff -u -rc482b47217e0ea686fe282ff2479f5946bbeaac5 -r2039b2a517f7868280bfb762cd4ff3341edd6c21
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision c482b47217e0ea686fe282ff2479f5946bbeaac5)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 2039b2a517f7868280bfb762cd4ff3341edd6c21)
@@ -984,7 +984,9 @@
         if ( lastDialInPumpDirectionCount != dirErrorCnt )
         {
             lastDialInPumpDirectionCount = dirErrorCnt;
+#ifndef DISABLE_PUMP_DIRECTION_CHECKS
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_DIALYSATE_INLET_PUMP )
+#endif
         }
 #endif
 
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rc482b47217e0ea686fe282ff2479f5946bbeaac5 -r2039b2a517f7868280bfb762cd4ff3341edd6c21
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision c482b47217e0ea686fe282ff2479f5946bbeaac5)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 2039b2a517f7868280bfb762cd4ff3341edd6c21)
@@ -877,7 +877,9 @@
         if ( lastDialOutPumpDirectionCount != dirErrorCnt )
         {
             lastDialOutPumpDirectionCount = dirErrorCnt;
+#ifndef DISABLE_PUMP_DIRECTION_CHECKS
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_DIALYSATE_OUTLET_PUMP )
+#endif
         }
 
         dopMCDir = ( getMeasuredDialOutPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2cf600cbe730fbecec037566d75c9fc6a6f8b391 -r2039b2a517f7868280bfb762cd4ff3341edd6c21
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2cf600cbe730fbecec037566d75c9fc6a6f8b391)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2039b2a517f7868280bfb762cd4ff3341edd6c21)
@@ -2311,7 +2311,7 @@
         TEMPERATURE_SENSORS_DATA_T payload;
 
         memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
-        setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant );
+        setDialysateTemperatureReadings( payload.TDi, payload.TRo );
     }
     // TODO - what to do if invalid payload length?
     // TODO - how to know if DG stops sending these?
@@ -5176,6 +5176,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingPercentOverride( payload.state.u32 );