Index: firmware/App/HDCommon.h
===================================================================
diff -u -rb5accb82ac043938255883b6c60a6f81795569b0 -rce48f926049a50239537917cda7eff06557a80bf
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision b5accb82ac043938255883b6c60a6f81795569b0)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision ce48f926049a50239537917cda7eff06557a80bf)
@@ -25,7 +25,7 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        5
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        9005
+#define HD_VERSION_BUILD        9007
 
 // ********** development build switches **********
 
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rb5accb82ac043938255883b6c60a6f81795569b0 -rce48f926049a50239537917cda7eff06557a80bf
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision b5accb82ac043938255883b6c60a6f81795569b0)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision ce48f926049a50239537917cda7eff06557a80bf)
@@ -872,6 +872,7 @@
     BOOL noEndTreatment = FALSE;
     BOOL noNewTreatment = FALSE;
     BOOL usrAckReq = FALSE;
+    BOOL noMinimize = TRUE;
     ALARM_ID_T   a;
 
     // Determine alarm flags
@@ -929,6 +930,12 @@
         noEndTreatment = TRUE;
     }
 
+    // If in Treatment-Stop state, allow user to minimize the alarm window
+    if ( ( MODE_TREA == getCurrentOperationMode() ) && ( TREATMENT_STOP_STATE == getTreatmentState() ) )
+    {
+        noMinimize = FALSE;
+    }
+
     // Set updated alarm flags
     alarmStatus.systemFault = systemFault;
     alarmStatus.stop = stop;
@@ -937,7 +944,8 @@
     alarmStatus.noRinseback = noRinseback;
     alarmStatus.noEndTreatment = noEndTreatment;
     alarmStatus.noNewTreatment = noNewTreatment;
-    alarmStatus.usrACKRequired = usrAckReq;
+    alarmStatus.usrACKRequired = usrAckReq;
+    alarmStatus.noMinimize = noMinimize;
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -rce48f926049a50239537917cda7eff06557a80bf
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision ce48f926049a50239537917cda7eff06557a80bf)
@@ -84,6 +84,7 @@
     BOOL                noNewTreatment;                             ///< No new treatments may be started even if current treatment is ended
     BOOL                noDialRecirc;                               ///< No dialysate re-circulation allowed at this time
     BOOL                usrACKRequired;                             ///< The user must acknowledge top alarm
+    BOOL                noMinimize;                                 ///< Prevent user from minimizing the alarm window
     BOOL                lampOn;                                     ///< The alarm lamp is on
 } COMP_ALARM_STATUS_T;
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -rce48f926049a50239537917cda7eff06557a80bf
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ce48f926049a50239537917cda7eff06557a80bf)
@@ -1140,6 +1140,7 @@
     payload.alarmsFlags |= ( almStatus.alarmsToEscalate             ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE) : 0 );
     payload.alarmsFlags |= ( almStatus.alarmsSilenced               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED)    : 0 );
     payload.alarmsFlags |= ( almStatus.lampOn                       ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON)            : 0 );
+    payload.alarmsFlags |= ( almStatus.noMinimize                   ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE)        : 0 );
     payload.alarmsFlags |= ( almStatus.topAlarmConditionnDetected   ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION)      : 0 );
 
     memcpy( payloadPtr, &payload, sizeof( ALARM_COMP_STATUS_PAYLOAD_T ) );