Index: firmware/App/Controllers/FluidLeak.c
===================================================================
diff -u -r28cf92e09bd48dee7a2275fd69cc9f39f1da03ca -r1761ea68fd78196f651d96140331894920d813e0
--- firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 28cf92e09bd48dee7a2275fd69cc9f39f1da03ca)
+++ firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 1761ea68fd78196f651d96140331894920d813e0)
@@ -67,10 +67,10 @@
  *************************************************************************/
 void execFluidLeak( void )
 {
-    BOOL state = noFPGAFluidLeakDetected();
+    BOOL noFluidLeakDetected = noFPGAFluidLeakDetected();
 
     // Get latest state reading
-    if ( TRUE == state )
+    if ( TRUE == noFluidLeakDetected )
     {
         fluidLeakState.data = FLUID_LEAK_STATE_DRY;
     }
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rd16609f215cf5ba8e08b902cf12a9492b40ed2cc -r1761ea68fd78196f651d96140331894920d813e0
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d16609f215cf5ba8e08b902cf12a9492b40ed2cc)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1761ea68fd78196f651d96140331894920d813e0)
@@ -1435,6 +1435,14 @@
                 handleTestSuperClearAlarmsRequest( message );
                 break;
 
+            case MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE:
+                handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
+                break;
+
+            case MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE:
+                handleSetFluidLeakStateDetectorOverrideRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;