Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rfc5a7684ab48a9c7f68dccd469e59daad9fd0a83 -r8ec630363568c635c5dfea0ede32a6ed1bfff781
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision fc5a7684ab48a9c7f68dccd469e59daad9fd0a83)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 8ec630363568c635c5dfea0ede32a6ed1bfff781)
@@ -196,7 +196,7 @@
  *************************************************************************/
 U32 execTreatmentMode( void )
 {
-#ifndef UF_TEST_ENABLED
+#if 0
     BOOL stop = isStopButtonPressed();
 
     if ( TRUE == stop )
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r0be794036ade5b7f998fc4654fa3ad3c09c45987 -r8ec630363568c635c5dfea0ede32a6ed1bfff781
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0be794036ade5b7f998fc4654fa3ad3c09c45987)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 8ec630363568c635c5dfea0ede32a6ed1bfff781)
@@ -147,6 +147,8 @@
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS
     { ALARM_PRIORITY_HIGH,   0,              ALARM_ID_NO_ALARM,                            FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE  }, // ALARM_ID_AIR_TRAP_FILL_DURING_PRIME
     { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE  }, // ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE  }, // ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW
+    { ALARM_PRIORITY_HIGH,   ALM_ESC_4_MIN,  ALARM_ID_BLOOD_SITTING_WARNING,               FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE  }, // ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW
 };
 
 // *** This declaration will cause a compiler error if alarmTable does not have same # of alarms as the Alarm_List enumeration.