Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r6e8917e48113a8798b26e489296a3f69509c0590 -r12ae81f766052993995d323456fa4c746cf4ee75
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 6e8917e48113a8798b26e489296a3f69509c0590)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 12ae81f766052993995d323456fa4c746cf4ee75)
@@ -700,7 +700,8 @@
     if ( ++treatmentParamsRangesBroadcastTimerCtr >= TREATMENT_SETTINGS_RANGES_PUB_INTERVAL )
     {
         // compute minimum treatment duration
-        U32 minTime = CALC_ELAPSED_TREAT_TIME_IN_MIN() + 2;  // add two minutes to cover rounding and ensure it's valid for next minute
+        U32 elapseTime = CALC_ELAPSED_TREAT_TIME_IN_MIN() + 2;        // add two minutes to cover rounding and ensure it's valid for next minute
+        U32 minTime = MAX( elapseTime, MIN_TREATMENT_TIME_MINUTES );  // treatment duration cannot be < 1 hour
         // compute maximum treatment duration (from both UF and dialysate volume perspectives)
         U32 maxTimeRem = ( MAX_UF_VOLUME_ML - (U32)getUltrafiltrationVolumeCollected() ) / ( presUFRate > 0.0 ? (U32)presUFRate : 1 );
         U32 maxTime1 = minTime + maxTimeRem;
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -re197cc27ab80e2250597746427725671f3491945 -r12ae81f766052993995d323456fa4c746cf4ee75
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e197cc27ab80e2250597746427725671f3491945)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 12ae81f766052993995d323456fa4c746cf4ee75)
@@ -31,8 +31,10 @@
 
 // MSG_ID_DG_CHECK_IN
 void handleDGCheckIn( MESSAGE_T *message );
+
 // MSG_ID_UI_CHECK_IN
 void handleUICheckIn( MESSAGE_T *message );
+
 // MSG_ID_REQUEST_FW_VERSIONS
 void handleFWVersionRequest( MESSAGE_T *message );
 
@@ -60,15 +62,19 @@
 
 // MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST
 void handleChangeUFSettingsRequest( MESSAGE_T *message );
+
 // MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE
 BOOL sendChangeUFSettingsResponse( BOOL accepted, U32 reason, F32 volume_mL, U32 time_min, F32 ufRate_mL_min, S32 timeDiff, F32 rateDiff, F32 oldUFRate_mL_min );
+
 // MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE
 void handleChangeUFSettingsConfirmation( MESSAGE_T *message );
+
 // MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE
 BOOL sendChangeUFSettingsOptionResponse( BOOL accepted, U32 reason, F32 volume_mL, U32 time_min, F32 ufRate_mL_min );
 
 // MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST
 void handleChangeTreatmentDurationRequest( MESSAGE_T *message );
+
 // MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE
 BOOL sendChangeTreatmentDurationResponse( BOOL accepted, U32 reason, U32 time_min, F32 volume_mL );
 
@@ -77,6 +83,7 @@
 
 // MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST
 void handleChangeBloodDialysateRateChangeRequest( MESSAGE_T *message );
+
 // MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE
 BOOL sendChangeBloodDialysateRateChangeResponse( BOOL accepted, U32 reason, U32 bloodRate, U32 dialRate );
 
@@ -106,8 +113,10 @@
 
 // MSG_ID_ALARM_STATUS
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
+
 // MSG_ID_ALARM_TRIGGERED
 BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
+
 // MSG_ID_ALARM_CLEARED
 BOOL broadcastAlarmCleared( U16 alarm );