Index: dialin/common/hd_defs.py
===================================================================
diff -u -rd76a5f67ae6c9534c3a0e43d5bb7d8adc61ad9eb -r5f109951b1eec291a8da38aba01470d3aa5a95b5
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision d76a5f67ae6c9534c3a0e43d5bb7d8adc61ad9eb)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 5f109951b1eec291a8da38aba01470d3aa5a95b5)
@@ -7,8 +7,8 @@
 #
 # @file    hd_defs.py
 #
-# @author  (last)      Micahel Garthwaite
-# @date    (last)      19-Jul-2022
+# @author  (last)      Behrouz NematiPour
+# @date    (last)      09-Sep-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  04-Dec-2020
 #
@@ -125,6 +125,7 @@
     NUM_OF_NO_CART_SELF_TESTS_STATES                        =  9    # Number of no cartridge self-tests states
 
 
+# This 'PreTreatmentWetSelfTesStates' may need to remove, during merge it was comparing with the folowing 'PreTreatmentDrySelfTestStates'
 @unique
 class PreTreatmentWetSelfTesStates(DialinEnum):
     WET_SELF_TESTS_START_STATE = 0
@@ -141,6 +142,7 @@
     WET_SELF_TESTS_STOPPED_STATE = 11
     WET_SELF_TESTS_COMPLETE_STATE = 12
 
+
 @unique
 class PreTreatmentDrySelfTestStates(DialinEnum):
     DRY_SELF_TESTS_START_STATE                              =  0    # Dry self-tests starting state
Index: dialin/common/msg_defs.py
===================================================================
diff -u -r5b0ab5cedede82f17a7eb11e1bedf2d9f63f77f3 -r5f109951b1eec291a8da38aba01470d3aa5a95b5
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 5b0ab5cedede82f17a7eb11e1bedf2d9f63f77f3)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 5f109951b1eec291a8da38aba01470d3aa5a95b5)
@@ -8,7 +8,7 @@
 # @file    msg_defs.py
 #
 # @author  (last)      Behrouz NematiPour
-# @date    (last)      17-Mar-2022
+# @date    (last)      08-Sep-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  07-Aug-2020
 #
Index: dialin/hd/sw_configs.py
===================================================================
diff -u -rfab0ce077e13918698b5310b685d5d736880f5e2 -r5f109951b1eec291a8da38aba01470d3aa5a95b5
--- dialin/hd/sw_configs.py	(.../sw_configs.py)	(revision fab0ce077e13918698b5310b685d5d736880f5e2)
+++ dialin/hd/sw_configs.py	(.../sw_configs.py)	(revision 5f109951b1eec291a8da38aba01470d3aa5a95b5)
@@ -74,6 +74,7 @@
     SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP = 39
     SW_CONFIG_DISABLE_SWITCHES_MONITOR = 40
     SW_CONFIG_ENABLE_VBA_SPECIAL_POSITION_C = 41
+    SW_CONFIG_ENABLE_V3_SYSTEM = 42
 
 
 class HDSoftwareConfigs(AbstractSubSystem):
Index: dialin/ui/dg_simulator.py
===================================================================
diff -u -r809454e87d6eacb2c2a335a7989e0d51371cf552 -r5f109951b1eec291a8da38aba01470d3aa5a95b5
--- dialin/ui/dg_simulator.py	(.../dg_simulator.py)	(revision 809454e87d6eacb2c2a335a7989e0d51371cf552)
+++ dialin/ui/dg_simulator.py	(.../dg_simulator.py)	(revision 5f109951b1eec291a8da38aba01470d3aa5a95b5)
@@ -8,7 +8,7 @@
 # @file    dg_simulator.py
 #
 # @author  (last)      Behrouz NematiPour
-# @date    (last)      16-Mar-2022
+# @date    (last)      29-Jun-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  16-Mar-2021
 #
Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -r4170ddc48204a32d3fdd12663325ee3f6e257b83 -r5f109951b1eec291a8da38aba01470d3aa5a95b5
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 4170ddc48204a32d3fdd12663325ee3f6e257b83)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 5f109951b1eec291a8da38aba01470d3aa5a95b5)
@@ -8,7 +8,7 @@
 # @file    hd_simulator.py
 #
 # @author  (last)      Behrouz NematiPour
-# @date    (last)      02-Apr-2022
+# @date    (last)      27-Jun-2022
 # @author  (original)  Peter Lucia
 # @date    (original)  06-Aug-2020
 #