Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -redd2e65f2ee38fbfdb3d5d3dd06412758ffb1f3a -r50c1ca0f742240722dd96bf141b0d7d34c37ed55
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision edd2e65f2ee38fbfdb3d5d3dd06412758ffb1f3a)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 50c1ca0f742240722dd96bf141b0d7d34c37ed55)
@@ -1719,6 +1719,30 @@
 
 /*********************************************************************//**
  * @brief
+ * The sendDGParkConcentratePumpsCommand function constructs a DG concetentrate
+ * pumps park request msg to the DG and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: DG park concentrate pumps command msg constructed and queued..
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDGParkConcentratePumpsCommand( void )
+{
+    BOOL result;
+    MESSAGE_T msg;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_PARK_CONCENTRATE_PUMPS_CMD_REQUEST;
+    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 sendDGStartFlushModeCommand function constructs a DG start/stop
  * flush mode command message and queues the msg for transmit on the
  * appropriate CAN channel.
@@ -2091,25 +2115,22 @@
  *************************************************************************/
 void handleAlarmTriggered( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == ( sizeof( U32 ) + sizeof( U32 ) * 2 * 2 ) )  // 2 data records w/ 2 U32s each
+    if ( message->hdr.payloadLen == sizeof( ALARM_TRIGGERED_PAYLOAD_T ) )
     {
+        ALARM_TRIGGERED_PAYLOAD_T payload;
         U08 *payloadPtr = message->payload;
-        U32 alarmID;
-        ALARM_DATA_T alm1, alm2;
 
-        memcpy( &alarmID, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm1.dataType, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm1.data, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm2.dataType, payloadPtr, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( &alm2.data, payloadPtr, sizeof( U32 ) );
+        memcpy( &payload, payloadPtr, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
 
-        if ( (ALARM_ID_T)alarmID < NUM_OF_ALARM_IDS )
+        if ( (ALARM_ID_T)(payload.alarm) < NUM_OF_ALARM_IDS )
         {
-            activateAlarm2Data( (ALARM_ID_T)alarmID, alm1, alm2 );
+            ALARM_DATA_T alm1, alm2;
+
+            alm1.dataType       = (ALARM_DATA_TYPES_T)(payload.almDataType1);
+            alm1.data.uInt.data = payload.almData1;
+            alm2.dataType       = (ALARM_DATA_TYPES_T)(payload.almDataType2);
+            alm2.data.uInt.data = payload.almData2;
+            activateAlarm2Data( (ALARM_ID_T)(payload.alarm), alm1, alm2, TRUE );
         }
     }
 }
@@ -5505,6 +5526,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );
@@ -8333,11 +8355,8 @@
  *************************************************************************/
 void handleTestHDDialinCheckIn( MESSAGE_T* message )
 {
-    BOOL status = FALSE;
-
     if ( 0 == message->hdr.payloadLen )
     {
-        status = TRUE;
         setDialinCheckInTimeStamp();
     }
 }
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -redd2e65f2ee38fbfdb3d5d3dd06412758ffb1f3a -r50c1ca0f742240722dd96bf141b0d7d34c37ed55
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision edd2e65f2ee38fbfdb3d5d3dd06412758ffb1f3a)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 50c1ca0f742240722dd96bf141b0d7d34c37ed55)
@@ -473,6 +473,9 @@
 // MSG_ID_DG_START_STOP_FLUSH
 BOOL sendDGStartFlushModeCommand( BOOL start );
 
+// MSG_ID_DG_PARK_CONCENTRATE_PUMPS
+BOOL sendDGParkConcentratePumpsCommand( void );
+
 // MSG_ID_DG_START_STOP_HEAT_DISINFECT
 BOOL sendDGStartHeatDisinfectModeCommand( BOOL start );
 
@@ -944,9 +947,6 @@
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
 BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response );
 
-// MSG_ID_HD_SEND_ALARMS_COMMAND
-void handleResendAllAlarmsCommand(  MESSAGE_T* message );
-
 // MSG_ID_HD_BLOOD_PUMP_SET_PWM
 void handleTestBloodPumpSetPWM( MESSAGE_T* message );