Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3f2b9de757500da37e0ed8881e4e906d94f3076c -r58f8416a9ff9c68ee34361ac23a46dcf56cfa79e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3f2b9de757500da37e0ed8881e4e906d94f3076c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 58f8416a9ff9c68ee34361ac23a46dcf56cfa79e)
@@ -3167,7 +3167,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?
@@ -3943,9 +3943,11 @@
 void handleFWVersionRequest( MESSAGE_T *message )
 {
     MESSAGE_T msg;
-    HD_VERSIONS_T payload;
+    HD_VERSIONS_T payload;  // TODO - add compatibility data to response
     U08 *payloadPtr = msg.payload;
 
+    // TODO - grab UI version data when UI includes it in this message
+
     // Populate payload
     payload.major = (U08)HD_VERSION_MAJOR;
     payload.minor = (U08)HD_VERSION_MINOR;
@@ -6093,6 +6095,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 );
@@ -6109,6 +6112,70 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleBloodPrimeVolumeOverrideRequest function handles a request to
+ * override the calculated blood prime volume (in mL).
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBloodPrimeVolumeOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetBloodPrimeVolumeOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetBloodPrimeVolumeOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleBloodPrimeSafetyVolumeOverrideRequest function handles a request to
+ * override the calculated safety blood prime volume (in mL).
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleBloodPrimeSafetyVolumeOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetBloodPrimeSafetyVolumeOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetBloodPrimeSafetyVolumeOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleHDSoftwareResetRequest function handles a request to reset the
  * HD firmware processor.
  * @details Inputs: none