Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r36923cf573ee2ae49ddaaf001068934c6bf88c6c -r7ec816dc21d7465fc45a5a1c8585bccb76ada48c
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 36923cf573ee2ae49ddaaf001068934c6bf88c6c)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 7ec816dc21d7465fc45a5a1c8585bccb76ada48c)
@@ -52,8 +52,7 @@
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< CRC error window
 
 #define MSG_NOT_ACKED_TIMEOUT_MS        150     ///< Maximum time for a Denali message that requires ACK to be ACK'd
-
-#define MSG_NOT_ACKED_TIMEOUT_MS_INIT   5000    ///< Maximum time for a Denali message that requires ACK to be ACK'd on the INIT state for the first (UI version request) message of the POST
+#define MSG_NOT_ACKED_TIMEOUT_MS_INIT   5000    ///< Maximum time for a Denali message that requires ACK to be ACK'd on the INIT state for the first (UI version request) message of the POST
 #define MSG_NOT_ACKED_MAX_RETRIES       3       ///< Maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
 #define PENDING_ACK_LIST_SIZE           25      ///< Maximum number of Denali messages that can be pending ACK at any given time
 
@@ -1618,10 +1617,6 @@
                 handleTestSyringePumpHeprinBolusTargetRateOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS:
-                handleTestCurrentTreamtmentParametersRequest( message );
-                break;
-
             case MSG_ID_HD_FANS_DUTY_CYCLE_OVERRIDE:
                 handleSetFansDutyCycleOverrideRequest( message );
                 break;
@@ -1634,6 +1629,10 @@
                 handleSetHDSoftwareConfigRecord( message );
                 break;
 
+            case MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS:
+                handleTestCurrentTreamtmentParametersRequest( message );
+                break;
+
             default:
                 // Unrecognized message ID received - ignore
                 break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r36923cf573ee2ae49ddaaf001068934c6bf88c6c -r7ec816dc21d7465fc45a5a1c8585bccb76ada48c
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 36923cf573ee2ae49ddaaf001068934c6bf88c6c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7ec816dc21d7465fc45a5a1c8585bccb76ada48c)
@@ -28,7 +28,6 @@
 #include "Fans.h"
 #include "FPGA.h"
 #include "ModeStandby.h"
-#include "ModeTreatmentParams.h"
 #include "OperationModes.h"
 #include "RTC.h"
 #include "SampleWater.h"
@@ -2310,7 +2309,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?
@@ -5136,6 +5135,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 );