Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -ra5723df5741ceaf13cd6cf9cab50a55bfea15501 -rb487406fcff8f9d282e3ce08f559916095605f3a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a5723df5741ceaf13cd6cf9cab50a55bfea15501)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b487406fcff8f9d282e3ce08f559916095605f3a)
@@ -3124,4 +3124,37 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
+ * request to override the fan RPM alarm start time.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestFansRPMAlarmStartTimeOffsetOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFanRPMAlarmStartTimeOffsetOverride( payload.state.u32, payload.index );
+        }
+        else
+        {
+            result = testResetFanRPMAlarmStartTimeOffsetOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/