Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -rfd25d67f37410037f22be9c6e958b100e3790de9 -r2d37388a2b6651ea4002d6720e933315e0ba7fa3
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision fd25d67f37410037f22be9c6e958b100e3790de9)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 2d37388a2b6651ea4002d6720e933315e0ba7fa3)
@@ -29,6 +29,7 @@
 import VTreatmentRinseback                          0.1
 import VTreatmentAdjustmentRinseback                0.1
 import VTreatmentAdjustmentRecirculate              0.1
+import VTreatmentBloodPrime                         0.1
 
 //  Qml imports
 import "qrc:/globals"
@@ -58,6 +59,7 @@
     VTreatmentAdjustmentUltrafiltrationConfirm  { id: vTreatmentAdjustmentUltrafiltrationConfirm    }
     VTreatmentAdjustmentPressuresLimits         { id: vTreatmentAdjustmentPressuresLimits           }
     VTreatmentAdjustmentHeparin                 { id: vTreatmentAdjustmentHeparin                   }
+    VTreatmentBloodPrime                        { id: vTreatmentBloodPrime                          }
     VTreatmentRinseback                         { id: vTreatmentRinseback                           }
     VTreatmentAdjustmentRinseback               { id: vTreatmentAdjustmentRinseback                 }
     VTreatmentAdjustmentRecirculate             { id: vTreatmentAdjustmentRecirculate               }
@@ -229,6 +231,7 @@
         }
     }
 
+    PostTreatmentBloodPrime         { id: _postTreatmentBloodPrime          }
     PostTreatmentRinseback          { id: _postTreatmentRinseback
         onResumeClicked             : vTreatmentAdjustmentRinseback     .doResume       ()
         onPauseClicked              : vTreatmentAdjustmentRinseback     .doPause        ()
@@ -367,14 +370,20 @@
     // and is more optimized and will never leave screen empty
     // also with what ever order they have been push with the reverse/correct animation will be poped or pushed.
     Connections { target: vHDTreatmentStates
+        onTxBloodPrimeChanged: {
+            if ( vtxBloodPrime ) {
+                back( _postTreatmentBloodPrime )
+            }
+        }
+
         onTxDialysisRunningChanged: {
-            if ( vHDTreatmentStates.txDialysisRunning ) {
+            if ( vtxDialysisRunning ) {
                 back( _treatmentStart )
             }
         }
 
         onTxDialysisEndChanged: {
-            if ( vHDTreatmentStates.txDialysisEnd ) {
+            if ( vtxDialysisEnd ) {
                 // if Tx completed
                 //      -> Rinseback
                 //      -> End / Disconnect
@@ -385,13 +394,11 @@
         }
 
         onTxStopChanged: {
-            if ( vHDTreatmentStates.txStop ) {
-                back( _postTreatmentComplete )
-            }
+            // only will be used to update the in-treatment screen
         }
 
         onTxRinsebackChanged: {
-            if ( vHDTreatmentStates.txRinseback ) {
+            if ( vtxRinseback ) {
                 // it may be navigated from complete or stop alarm dialog,
                 // which in the later case it can't be replaced with main treatment
                 // since user is able to go back to main treament if it's not timed out.
@@ -400,13 +407,13 @@
         }
 
         onRbStopChanged: {
-            if ( vHDTreatmentStates.rbStop ) {
+            if ( vrbStop ) {
                 back( _postTreatmentRinsebackComplete )
             }
         }
 
         onRbAdditionalChanged: {
-            if ( vHDTreatmentStates.rbAdditional ) {
+            if ( vrbAdditional ) {
                 // it may be navigated from complete or stop alarm dialog,
                 // which in the later case it can't be replaced with main treatment
                 // since user is able to go back to main treament if it's not timed out.
@@ -415,7 +422,7 @@
         }
 
         onTxRecirculateChanged: {
-            if ( vHDTreatmentStates.txRecirculate ) {
+            if ( vtxRecirculate ) {
                 // application state by design is navigating always from Rinseback to recirculate
                 // so always it is rinseback on top which has to be replaced by recirculate
                 // also we never go back to rinseback from recirculate and will go back to blood priming