Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rf9459f1e07eb06c50be005a667d8f8dd1a5d132e -ra2c3d3a057ff491401d8507ae15e87d741e5ea65
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f9459f1e07eb06c50be005a667d8f8dd1a5d132e)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision a2c3d3a057ff491401d8507ae15e87d741e5ea65)
@@ -1211,13 +1211,8 @@
 
             case MSG_ID_DG_RESERVOIR_TARE_REQUEST:
                 handleTestTareReservoirRequest( message );
-
                 break;
 
-            case MSG_ID_HD_REQUEST_DG_ALARMS:
-                handleResendAllAlarmsCommand( message );
-                break;
-
             case MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE:
                 handleTestGenIdlePublishIntervalOverride( message );
                 break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r9ebe4663bc49e037ccd6287c265c45746a86c4ff -ra2c3d3a057ff491401d8507ae15e87d741e5ea65
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9ebe4663bc49e037ccd6287c265c45746a86c4ff)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a2c3d3a057ff491401d8507ae15e87d741e5ea65)
@@ -3687,6 +3687,30 @@
 
 /*********************************************************************//**
 * @brief
+* The handleResendAllAlarmsCommand function handles a request to re-send
+* all active DG 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 handleSetDGUsageInfoRecord function handles a request to set the DG
 * information record.
 * @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r9ebe4663bc49e037ccd6287c265c45746a86c4ff -ra2c3d3a057ff491401d8507ae15e87d741e5ea65
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 9ebe4663bc49e037ccd6287c265c45746a86c4ff)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision a2c3d3a057ff491401d8507ae15e87d741e5ea65)
@@ -394,6 +394,9 @@
 // MSG_ID_DG_SET_SW_CONFIG_RECORD
 void handleSetDGSoftwareConfigRecord( MESSAGE_T *message );
 
+// MSG_ID_HD_REQUEST_DG_ALARMS
+void handleResendAllAlarmsCommand( MESSAGE_T *message );
+
 // MSG_ID_DG_HD_COMMUNICATION_STATUS
 void handleTestHDCommunicationStatusOverrideRequest( MESSAGE_T *message );