Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -re64816def7cd98e7dcb6d133b3a56c9fea835af3 -ra74a66caeda4a3a9b831d9f7c698553fa6fa0882
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision e64816def7cd98e7dcb6d133b3a56c9fea835af3)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision a74a66caeda4a3a9b831d9f7c698553fa6fa0882)
@@ -1087,7 +1087,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
         }
 
         dipMCDir = ( getMeasuredDialInPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -re64816def7cd98e7dcb6d133b3a56c9fea835af3 -ra74a66caeda4a3a9b831d9f7c698553fa6fa0882
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision e64816def7cd98e7dcb6d133b3a56c9fea835af3)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision a74a66caeda4a3a9b831d9f7c698553fa6fa0882)
@@ -798,7 +798,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 -r844f98879b7425c207b58562e623ab960adbc357 -ra74a66caeda4a3a9b831d9f7c698553fa6fa0882
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 844f98879b7425c207b58562e623ab960adbc357)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a74a66caeda4a3a9b831d9f7c698553fa6fa0882)
@@ -3260,7 +3260,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?
@@ -6229,6 +6229,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 );