Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r69f74d389c57686e5ad618ac57ccbdbfa6934805 -rf326ce71744dca862c186bc00795e84562e80936
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 69f74d389c57686e5ad618ac57ccbdbfa6934805)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision f326ce71744dca862c186bc00795e84562e80936)
@@ -345,9 +345,9 @@
 void stopDialysis( void )
 {
     // Stop pumps
-    setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-    setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-    setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+    signalDialInPumpHardStop();
+    signalDialOutPumpHardStop();
+    signalBloodPumpHardStop();
     stopSyringePump();
     // Tell DG to stop heating dialysate
     cmdStopDGTrimmerHeater();
@@ -1274,10 +1274,15 @@
     lcLastSteadyWeight[cycle][lcPrimaryIndex] = loadCellPrimaryWeight;
     lcLastSteadyWeight[cycle][lcBackupIndex]  = loadCellBackupWeight;
 
-    // Check for drift out of range
-    if ( driftDiff > LOAD_CELL_PRIMARY_BACKUP_MAX_ALLOWED_DRIFT_GRAMS )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, loadCellCurrentDrift, loadCellPreviousDrift )
+        // Check for drift out of range
+        if ( driftDiff > LOAD_CELL_PRIMARY_BACKUP_MAX_ALLOWED_DRIFT_GRAMS )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, loadCellCurrentDrift, loadCellPreviousDrift )
+        }
     }
 }
 
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r8b73263b38f449dacc0795c67a7cf6240cb79026 -rf326ce71744dca862c186bc00795e84562e80936
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 8b73263b38f449dacc0795c67a7cf6240cb79026)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision f326ce71744dca862c186bc00795e84562e80936)
@@ -478,8 +478,10 @@
 
         systemREG1->SYSESR = systemREG1->SYSESR;                                             // clear reset bit(s) after logging event so subsequent resets can be properly identified as not being power-on resets.
 
-        sendUIVersionRequest();
+        sendUIVersionRequest();                                                              // request UI to send us its version - needed for compatibility check
 
+        sendRequestForDGResendAlarms();                                                      // request DG to re-send any active alarms that may have been triggered before we came up
+
         // Send the startup event
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_STARTUP, systemREG1->DEV, 0x12345678 )          // log startup event w/ device ID bits
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_STARTUP, resetReason, systemREG1->GBLSTAT )     // log startup event w/ reset reason(s) bits
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r63d676004c2bc1d51fee13985091cf68a345d3a0 -rf326ce71744dca862c186bc00795e84562e80936
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 63d676004c2bc1d51fee13985091cf68a345d3a0)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f326ce71744dca862c186bc00795e84562e80936)
@@ -1569,10 +1569,9 @@
  * @details Inputs: none
  * @details Outputs: DG start/stop trimmer heater command msg constructed and queued.
  * @param start TRUE indicates start heater, FALSE indicates stop heater
- * @param trimmerHtrTemp target temperature for trimmer heater
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start, F32 trimmerHtrTemp )
+BOOL sendDGStartStopTrimmerHeaterCommand( BOOL start )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -1581,11 +1580,9 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD;
-    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( F32 );
+    msg.hdr.payloadLen = sizeof( BOOL );
 
     memcpy( payloadPtr, &start, sizeof( BOOL ) );
-    payloadPtr += sizeof( BOOL );
-    memcpy( payloadPtr, &trimmerHtrTemp, sizeof( F32 ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
@@ -2270,7 +2267,6 @@
 {
     BOOL result;
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
 
     // Create a message record
     blankMessage( &msg );
@@ -2363,13 +2359,13 @@
     {
         TEMPERATURE_SENSORS_DATA_T payload;
 
-        memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
-        setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant );
-    }
-    // TODO - what to do if invalid payload length?
-    // TODO - how to know if DG stops sending these?
-}
-
+        memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
+        setDialysateTemperatureReadings( payload.TDi, payload.TRo );
+    }
+    // TODO - what to do if invalid payload length?
+    // TODO - how to know if DG stops sending these?
+}
+
 /*********************************************************************//**
  * @brief
  * The handleDialysateFlowData function handles dialysate flow data broadcast
@@ -3624,38 +3620,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleHDSetArterialPressureOffsetRequest function handles a request to
- * set the arterial pressure offset.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleHDSetArterialPressureOffsetRequest( 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 = testSetArterialPressureOffsetOverride( payload.state.f32 );
-        }
-        else
-        {
-            result = testResetArterialPressureOffsetOverride();
-        }
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleTestBloodPumpRotorMeasuredSpeedOverrideRequest function handles a request to
  * override the measured blood pump rotor speed (RPM).
  * @details Inputs: none
@@ -5191,6 +5155,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 );
@@ -7066,15 +7031,26 @@
 {
     BOOL status = FALSE;
     HD_OP_MODE_T currentMode = getCurrentOperationMode();
+    DG_OP_MODE_T currentDGMode = getDGOpMode();
     REQUEST_REJECT_REASON_CODE_T reject;
 
     if ( 0 == message->hdr.payloadLen )
     {
         if ( ( MODE_STAN == currentMode ) || ( MODE_FAUL == currentMode ) )
         {
-            status = TRUE;
+
             requestNewOperationMode( MODE_SERV );
-            reject = REQUEST_REJECT_REASON_NONE;
+
+            if ( (DG_MODE_STAN == currentDGMode) || (DG_MODE_FAUL == currentDGMode) )
+            {
+                status = TRUE;
+                cmdSetDGToServiceMode();
+                reject = REQUEST_REJECT_REASON_NONE;
+            }
+            else
+            {
+                reject = REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE;
+            }
         }
         else
         {
@@ -7120,6 +7096,30 @@
 }
 
 /*********************************************************************//**
+ * @brief
+ * The sendRequestForDGResendAlarms function sends out the HD request for
+ * DG re-send all active alarms.
+ * @details Inputs: none
+ * @details Outputs: DG alarms re-send request msg constructed and queued
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendRequestForDGResendAlarms( void )
+{
+    BOOL result;
+    MESSAGE_T msg;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_REQUEST_DG_ALARMS;
+    msg.hdr.payloadLen = 0;
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
 * @brief
 * The handleGetHDUsageInfoRecord function handles a request to get the HD
 * usage information record.
@@ -7275,15 +7275,15 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSendBloodLeakEmbeddedModeCommandResponse function sends out
+ * The sendBloodLeakEmbeddedModeCommandResponse function sends out
  * the blood leak embedded mode command response.
  * @details Inputs: none
  * @details Outputs: blood leak embedded mode command response msg constructed and queued
  * @param responseLen: the length of the buffer
  * @param response: pointer to the response buffer
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL handleSendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response )
+BOOL sendBloodLeakEmbeddedModeCommandResponse( U32 responseLen, U08* response )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -7304,4 +7304,52 @@
     return result;
 }
 
+/*********************************************************************//**
+* @brief
+* The handleResendAllAlarmsCommand function handles a request to re-send
+* all active HD alarms.
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleResendAllAlarmsCommand(  MESSAGE_T* message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        handleResendActiveAlarmsRequest();
+        result = TRUE;
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendDGServiceModeRequest function constructs a service mode request msg
+ * to the DG and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: DG Service mode request msg constructed and queued.
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDGServiceModeRequest()
+{
+    BOOL result;
+    MESSAGE_T msg;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_REQUEST_DG_SERVICE_MODE;
+    msg.hdr.payloadLen = 0;
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
+
+    return result;
+}
+
 /**@}*/