Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5e12061a34634f5282cb370fada17d1ab6717c4c -rad3acf79a6b0fa54234cc3b70b26600790d61500
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5e12061a34634f5282cb370fada17d1ab6717c4c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ad3acf79a6b0fa54234cc3b70b26600790d61500)
@@ -1275,13 +1275,14 @@
     BOOL result;
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
+    U32 leakState = (U32)state;
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_AIR_TRAP_DATA;
-    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
+    msg.hdr.msgID = MSG_ID_HD_FLUID_LEAK_STATE;
+    msg.hdr.payloadLen = sizeof( U32 );
 
-    memcpy( payloadPtr, &state, sizeof( U32 ) );
+    memcpy( payloadPtr, &leakState, sizeof( U32 ) );
 
     // 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_BROADCAST, ACK_NOT_REQUIRED );
@@ -3956,6 +3957,70 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleSetFluidLeakBroadcastIntervalOverrideRequest function handles a
+ * request to override the fluid leak state broadcast interval.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetFluidLeakBroadcastIntervalOverrideRequest( 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 = testSetFluidLeakStatePublishIntervalOverride( (U32)(payload.state.u32) );
+        }
+        else
+        {
+            result = testResetFluidLeakStatePublishIntervalOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleSetFluidLeakStateDetectorOverrideRequest function handles a request to
+ * override the fluid leak detector state.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetFluidLeakStateDetectorOverrideRequest( 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 = testSetFluidLeakStateOverride( FLUID_LEAK_STATES_T)(payload.state.u32) );
+        }
+        else
+        {
+            result = testResetFluidLeakStateOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleHDSoftwareResetRequest function handles a request to reset the
  * HD firmware processor.
  * @details Inputs: none