Index: dialin/common/msg_defs.py
===================================================================
diff -u -r4b2e494d11cc081ac3724276be7178820004bd83 -r4e66eef7643f2271904aa78e1506f83bb712be32
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 4b2e494d11cc081ac3724276be7178820004bd83)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 4e66eef7643f2271904aa78e1506f83bb712be32)
@@ -106,6 +106,8 @@
     MSG_ID_HD_BLOOD_PRIME_PROGRESS = 0x59                       # HD broadcast of blood prime progress
     MSG_ID_UI_TX_END_CMD = 0x57                                 # UI end treatment sub-mode user request
     MSG_ID_HD_TX_END_CMD_RESPONSE = 0x58                        # HD end treatment sub-mode user request response
+    MSG_ID_HD_FLUID_LEAK_STATE = 0x6A                           # HD broadcast of fluid leak state
+    MSG_ID_DG_FLUID_LEAK_STATE = 0x6B                           # DG broadcast of fluid leak state
 
     MSG_ID_CAN_ERROR_COUNT = 0x999                              # test code in support of EMC testing
 
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -r1ab15a50a984c98b85eb63b7dd843fda51f4a412 -r4e66eef7643f2271904aa78e1506f83bb712be32
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 1ab15a50a984c98b85eb63b7dd843fda51f4a412)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 4e66eef7643f2271904aa78e1506f83bb712be32)
@@ -17,6 +17,7 @@
 from .accelerometer import DGAccelerometer
 from .alarms import DGAlarms
 from .drain_pump import DGDrainPump
+from .fluid_leak import DGFluidLeak
 from .hd_proxy import DGHDProxy
 from .load_cells import DGLoadCells
 from .pressures import DGPressures
@@ -133,6 +134,7 @@
 
         # Create command groups
         self.accel = DGAccelerometer(self.can_interface, self.logger)
+        self.fluid_leak = DGFluidLeak(self.can_interface, self.logger)
         self.hd_proxy = DGHDProxy(self.can_interface, self.logger)
         self.load_cells = DGLoadCells(self.can_interface, self.logger)
         self.pressures = DGPressures(self.can_interface, self.logger)
@@ -324,4 +326,3 @@
         # Send message
         self.can_interface.send(message, 0)
         self.logger.debug("Sent request to DG to reset...")
-
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r189eabdb9a679305c6ac87a78f4bffb99b19c297 -r4e66eef7643f2271904aa78e1506f83bb712be32
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 189eabdb9a679305c6ac87a78f4bffb99b19c297)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 4e66eef7643f2271904aa78e1506f83bb712be32)
@@ -18,6 +18,7 @@
 from .air_trap import HDAirTrap
 from .alarms import HDAlarms
 from .buttons import HDButtons
+from .fluid_leak import HDFluidLeak
 from .ui_proxy import HDUIProxy
 from .watchdog import HDWatchdog
 from .rtc import HDRTC
@@ -109,6 +110,7 @@
         self.air_trap = HDAirTrap(self.can_interface, self.logger)
         self.alarms = HDAlarms(self.can_interface, self.logger)
         self.buttons = HDButtons(self.can_interface, self.logger)
+        self.fluid_leak = HDFluidLeak(self.can_interface, self.logger)
         self.ui = HDUIProxy(self.can_interface, self.logger)
         self.rtc = HDRTC(self.can_interface, self.logger)
         self.watchdog = HDWatchdog(self.can_interface, self.logger)
@@ -118,7 +120,6 @@
         self.treatment = HDTreatment(self.can_interface, self.logger)
         self.pressure_occlusion = HDPressureOcclusion(self.can_interface, self.logger)
         self.valves = HDValves(self.can_interface, self.logger)
-        self.fluid_leak = HDFluidLeak(self.can_interface, self.logger)
 
     def get_operation_mode(self):
         """