Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r050984357442e3ee0d6d5b21e274c1306643c598 -rea73bfe6fbeae8e42c7c22a68338aed6fa340914
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 050984357442e3ee0d6d5b21e274c1306643c598)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision ea73bfe6fbeae8e42c7c22a68338aed6fa340914)
@@ -423,8 +423,8 @@
 
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) )
-    {
 #endif
+    {
         if ( ARTERIAL_PRESSURE_NORMAL_OP == artPresStatus )
         {
             U08 artReadCtr = getFPGADVTArterialPressureReadCounter();
@@ -453,8 +453,8 @@
 
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) != SW_CONFIG_ENABLE_VALUE )
-    {
 #endif
+    {
         if ( 0 == artPresAlarm )
         {
             U08 artReadCtr  = getFPGAArterialPressureReadCounter();
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rdbf9c245d46c7536c72d277da24f7b44d7a84118 -rea73bfe6fbeae8e42c7c22a68338aed6fa340914
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision dbf9c245d46c7536c72d277da24f7b44d7a84118)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision ea73bfe6fbeae8e42c7c22a68338aed6fa340914)
@@ -587,7 +587,6 @@
         {
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_BOLUS_CMD, syringePumpSetRate )
         }
-
     }
 
     return syringePumpBolusRequested;
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r74f1eb422951e99b1fdb85de0384c41f4e5ff6eb -rea73bfe6fbeae8e42c7c22a68338aed6fa340914
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 74f1eb422951e99b1fdb85de0384c41f4e5ff6eb)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision ea73bfe6fbeae8e42c7c22a68338aed6fa340914)
@@ -1267,5 +1267,4 @@
     }
 }
 
-
 /**@}*/
Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -rdbf9c245d46c7536c72d277da24f7b44d7a84118 -rea73bfe6fbeae8e42c7c22a68338aed6fa340914
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision dbf9c245d46c7536c72d277da24f7b44d7a84118)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision ea73bfe6fbeae8e42c7c22a68338aed6fa340914)
@@ -491,24 +491,24 @@
 {
     RINSEBACK_STATE_T result = RINSEBACK_STOP_STATE;
 
-    // Have we been in this stopped state for too long w/o having delivered full blood volume back to patient?
-    if ( ( rinsebackTimerCtr > MAX_RINSEBACK_TIME ) && ( getRinsebackVolume() < rinsebackTargetVolume_mL ) )
-    {
-        signalGoToTreatmentStopped();
-        activateAlarmNoData( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
-    }
     // Have we been in this stopped state for too long despite having delivered full blood volume back to patient?
-    else if ( ( rinsebackTimerCtr > MAX_RINSEBACK_DONE_TIME ) /*&& ( getRinsebackVolume() >= rinsebackTargetVolume_mL )*/ ) // Commented out the second condition because the done time > max rinse back time
+    if ( ( rinsebackTimerCtr > MAX_RINSEBACK_DONE_TIME ) && ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
     {
         signalGoToTreatmentStopped();
         activateAlarmNoData( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
         clearAlarm( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING );
     }
     // Have we been in this stopped state for too long despite having delivered full blood volume back to patient?
-    else if ( ( RINSEBACK_DONE_WARNING_TIME == rinsebackTimerCtr ) /*&& ( getRinsebackVolume() >= rinsebackTargetVolume_mL )*/ ) // Commented out the second condition because the warning time > max rinse back time
+    else if ( ( RINSEBACK_DONE_WARNING_TIME == rinsebackTimerCtr ) && ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
     {
         activateAlarmNoData( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING );
     }
+    // Have we been in this stopped state for too long w/o having delivered full blood volume back to patient?
+    else if ( ( rinsebackTimerCtr > MAX_RINSEBACK_TIME ) && ( getRinsebackVolume() < rinsebackTargetVolume_mL ) )
+    {
+        signalGoToTreatmentStopped();
+        activateAlarmNoData( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
+    }
     else if ( TRUE == recircRequested )
     {
         signalRinsebackToRecirc();