Index: dialin/dg/chemical_disinfect.py
===================================================================
diff -u -r45f70ed84010200e8582a25ccd8792100f4f4fc4 -rf9af29dcdcd16cc88e7024f189397475de61a8c2
--- dialin/dg/chemical_disinfect.py	(.../chemical_disinfect.py)	(revision 45f70ed84010200e8582a25ccd8792100f4f4fc4)
+++ dialin/dg/chemical_disinfect.py	(.../chemical_disinfect.py)	(revision f9af29dcdcd16cc88e7024f189397475de61a8c2)
@@ -63,6 +63,26 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_chemical_disinfect_to_ui_sync)
 
+    def clear_chem_disinfect_info(self) -> None:
+        """
+        Clears public class properties that are updated by the handler.
+        Specifically properties updated  by the DG broadcast message
+        MSG_ID_DG_CHEM_DISINFECT_DATA.
+
+        @returns none
+        """
+
+        self.chemical_disinfect_state = 0
+        self.overall_elapsed_time = 0
+        self.state_elapsed_time = 0
+        self.cancellation_mode = 0
+        self.r1_level = 0
+        self.r2_level = 0
+        self.target_post_rinse_count = 0
+        self.current_post_rinse_count = 0
+        self.chemical_disinfect_ui_state = 0
+
+
     @publish(["chemical_disinfect_elapsed_time", "chemical_disinfect_target_time"])
     def _handler_chemical_disinfect_to_ui_sync(self, message):
         """
Index: dialin/dg/heat_disinfect.py
===================================================================
diff -u -r1bf1193409e2c8b723e52a2eabc6c532e0e64215 -rf9af29dcdcd16cc88e7024f189397475de61a8c2
--- dialin/dg/heat_disinfect.py	(.../heat_disinfect.py)	(revision 1bf1193409e2c8b723e52a2eabc6c532e0e64215)
+++ dialin/dg/heat_disinfect.py	(.../heat_disinfect.py)	(revision f9af29dcdcd16cc88e7024f189397475de61a8c2)
@@ -90,6 +90,24 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_heat_disinfect_to_ui_sync)
 
+    def clear_heat_disinfect_info(self) -> None:
+        """
+        Clears public class properties that are updated by the handler.
+        Specifically properties updated  by the DG broadcast message
+        MSG_ID_DG_HEAT_DISINFECT_DATA.
+
+        @returns none
+        """
+
+        self.heat_disinfect_state = 0
+        self.overall_elapsed_time = 0
+        self.state_elapsed_time = 0
+        self.cancellation_mode = 0
+        self.r1_level = 0
+        self.r2_level = 0
+        self.heat_disinfect_ui_state = 0
+
+
     @publish(["heat_disinfect_target_time", "heat_disinfect_count_down_time"])
     def _handler_heat_disinfect_to_ui_sync(self, message):
         """
Index: dialin/hd/alarms.py
===================================================================
diff -u -r6e43364eee938370f5885668510da7a9293d24a1 -rf9af29dcdcd16cc88e7024f189397475de61a8c2
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 6e43364eee938370f5885668510da7a9293d24a1)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision f9af29dcdcd16cc88e7024f189397475de61a8c2)
@@ -193,28 +193,28 @@
         """
         return self.alarms_escalates_in
 
-    def get_alarms_flags(self):  # TODO - update flags to latest
+    def get_alarms_flags(self):
         """
         Gets the alarms flags
 
         Extract each flag from the flags int using bit-masking. E.g.
 
-         System Fault       = result & 1
-         Stop               = result & 2
-         No Clear           = result & 4
-         No Resume          = result & 8
-         No Rinseback       = result & 16
-         No End Treatment   = result & 32
-         TBD                = result & 64
-         Ok Button Only     = result & 128
-         Alarms to Escalate = result & 256
-         Alarms Silenced    = result & 512
-         Alarm Lamp On      = result & 1024
-         TBD                = result & 2048
-         Blood Recirc       = result & 4096
-         Dialysate Recirc   = result & 8192
-         No Minimize        = result & 16384
-         Condition Detected = result & 32768
+         System Fault        = result & 1
+         Stop                = result & 2
+         No Clear            = result & 4
+         No Resume           = result & 8
+         No Rinseback        = result & 16
+         No End Treatment    = result & 32
+         No New Treatment    = result & 64
+         User Must ACK       = result & 128
+         Alarms to Escalate  = result & 256
+         Alarms Silenced     = result & 512
+         Alarm Lamp On       = result & 1024
+         TBD                 = result & 2048
+         No Blood Recirc     = result & 4096
+         No Dialysate Recirc = result & 8192
+         No Minimize         = result & 16384
+         Condition Detected  = result & 32768
 
         @return: (int) The alarms flags value
         """