Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -re7b65409100c66dfe8b1a18b89c5245adb21ce2d -r6d750c93f17571bbeba89404b63d87f37a9243af
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision e7b65409100c66dfe8b1a18b89c5245adb21ce2d)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 6d750c93f17571bbeba89404b63d87f37a9243af)
@@ -880,8 +880,9 @@
  * @brief
  * The handleTreatmentRinsebackState function executes the rinseback state of the
  * Treatment Mode state machine.
- * @details Inputs: none
- * @details Outputs: treatment rinseback sub-mode executed.
+ * @details Inputs: endTreatmentAlarmResponseRequest, resumeTreatmentAlarmResponseRequest,
+ * rinsebackToRecircRequest, rinsebackToStoppedRequest, endTreatmentRequest
+ * @details Outputs: treatment rinseback sub-mode executed, sendLastTreatmentPeriodicData
  * @return next treatment mode state
  *************************************************************************/
 static TREATMENT_STATE_T handleTreatmentRinsebackState( void )
Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -re7b65409100c66dfe8b1a18b89c5245adb21ce2d -r6d750c93f17571bbeba89404b63d87f37a9243af
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision e7b65409100c66dfe8b1a18b89c5245adb21ce2d)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 6d750c93f17571bbeba89404b63d87f37a9243af)
@@ -38,7 +38,7 @@
 
 // ********** private definitions **********
 
-#define DEFAULT_RINSEBACK_VOLUME_ML                 400.0F                  ///< Default rinseback volume (in mL).
+#define DEFAULT_RINSEBACK_VOLUME_ML                 350.0F                  ///< Default rinseback volume (in mL).
 #define MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML    300.0F                  ///< Maximum total additional rinseback volume allowed : all additionals (in mL).
 #define TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML        50.0F                  ///< Target rinseback volume for an additional volume request (in mL).
 #define RINSEBACK_FLOW_RATE_ADJ_ML_MIN               25                     ///< Adjustment amount (in mL/min) to apply when user requests increase/decrease in flow rate.
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r161b58d6a634e84f19d3c9758a332ac8791a09af -r6d750c93f17571bbeba89404b63d87f37a9243af
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 161b58d6a634e84f19d3c9758a332ac8791a09af)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6d750c93f17571bbeba89404b63d87f37a9243af)
@@ -770,7 +770,7 @@
         {
             uiTO_MS = UI_COMM_SERVICE_MODE_TIMEOUT_IN_MS;
         }
-        if ( TRUE == didTimeout( timeOfLastUICheckIn, UI_COMM_TIMEOUT_IN_MS ) )
+        if ( TRUE == didTimeout( timeOfLastUICheckIn, uiTO_MS ) )
         {
 #ifndef _RELEASE_
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_COMM_ALARMS ) != SW_CONFIG_ENABLE_VALUE )