Index: sources/drydemo/StateController.h
===================================================================
diff -u -r521f29cb7dcd0de352dd744292488380e07cb9e3 -re8edefcae8e47854198b06c1a65e4e45da5f3afc
--- sources/drydemo/StateController.h	(.../StateController.h)	(revision 521f29cb7dcd0de352dd744292488380e07cb9e3)
+++ sources/drydemo/StateController.h	(.../StateController.h)	(revision e8edefcae8e47854198b06c1a65e4e45da5f3afc)
@@ -67,6 +67,7 @@
         quint32         rinsebackTimerCounter;
         quint32         rinsebackAdditionalTimerCounter;
         float           rinsebackTgtVolPlusAddVolML;
+        bool            isRecircAllowed;
         // Recirculation variables
         bool            hasRecircBeenRequested;
         quint32         recircTimerCounter;
@@ -88,6 +89,8 @@
         quint32         bicartDepresInProgress;
         // Treatment end
         quint32         treatmentEndTimeoutAlarmCtr;
+        // Dialysate flow
+        bool            isDialysateInBypass;
     };
 
     struct Treatment_HDF_vars {
@@ -99,6 +102,7 @@
         quint32             hdfControlTimeCtr;
         bool                hdfHasMaxVolumeBeenReached;
         bool                hdfIsRequested;
+        bool                hdfPrevIsRequested;
     };
 
     struct Pressure_Vars {
@@ -260,7 +264,7 @@
     void handleTreatmentTimeProcessAndBroadcastData(const Broadcast_Type BCType);
     void handleTreatmentPrescriptionEditRequestMessage();
     void handleSetPointBloodFlowChange(quint32 &bloodFlowMLPM, bool &hasBloodFlowChanged);
-    void handleDDGenDialysateModeBroadcastData(const Broadcast_Type BCType, const bool isDialysateBypass = false);
+    void handleDDGenDialysateModeBroadcastData(const Broadcast_Type BCType);
     void handleSetPointDialysateFlowChange();
     void handleDDConductivityBroadcastData(const Broadcast_Type BCType);
     void handleUltrafiltrationBroadcastData(const Broadcast_Type BCType);
@@ -271,7 +275,7 @@
     void handleUltrafiltrationVolumeChangeConfirm();
     void handleTreatmentTimeChangeValidation();
     void handleTreatmentTimeChangeConfirm();
-    void handleTreatmentPauseBroadcastData(const Broadcast_Type BCType);
+    void handleTreatmentPauseBroadcastData(const Broadcast_Type BCType, const bool zeroCounter = false);
     // Treatment pressure methods
     void handlePressureLimitState();
     void handleUpdatePressureLimitWindows();