Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re0af40e2557c9f9c4fd9f97e909b3cccdc2d15fe -r33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e0af40e2557c9f9c4fd9f97e909b3cccdc2d15fe)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad)
@@ -6748,4 +6748,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 );
+}
+
 /**@}*/