Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rbd8d1a18ca5d9dd52c1082f74c19b90ca925af92 -rd5c37b914ce0ba48310f564c9844d03e836679df
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision bd8d1a18ca5d9dd52c1082f74c19b90ca925af92)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision d5c37b914ce0ba48310f564c9844d03e836679df)
@@ -429,7 +429,7 @@
  * volume collected so far for current treatment.
  * @details Inputs: measUFVolume, measUFVolumeFromPriorReservoirs
  * @details Outputs: none
- * @return currentUFState
+ * @return measUFVolume
  *************************************************************************/
 F32 getUltrafiltrationVolumeCollected( void )
 {
@@ -444,7 +444,7 @@
  * reference volume.
  * @details Inputs: measUFVolume, measUFVolumeFromPriorReservoirs
  * @details Outputs: none
- * @return currentUFState
+ * @return refUFVolume
  *************************************************************************/
 F32 getUltrafiltrationReferenceVolume( void )
 {
@@ -496,8 +496,6 @@
 
     // Send response w/ reason code if rejected
     sendUFPauseResumeResponse( result, rejectReason, currentUFState );
-    // Send state data immediately for UI update
-    broadcastTreatmentTimeAndState();
 
     return result;
 }
@@ -524,7 +522,7 @@
         setDialOutPumpTargetRate( setDialysateFlowRate + FLOAT_TO_INT_WITH_ROUND( setUFRate ), MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
         // Restart UF time accumulation for reference volume calculation
         lastUFTimeStamp = getMSTimerCount();
-        // Go to UF paused state
+        // Go to UF running state
         currentUFState = UF_RUNNING_STATE;
     }
     else
@@ -731,17 +729,6 @@
             salineBolusStartRequested = FALSE;
         }
     }
-    // Handle auto-resume after saline bolus
-    else if ( TRUE == salineBolusAutoResumeUF )
-    {
-        salineBolusAutoResumeUF = FALSE;
-        // Set outlet pump to dialysate rate + set UF rate
-        setDialOutPumpTargetRate( setDialysateFlowRate + FLOAT_TO_INT_WITH_ROUND( setUFRate ), MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-        // Restart UF time accumulation for reference volume calculation
-        lastUFTimeStamp = getMSTimerCount();
-        // Resume UF
-        result = UF_RUNNING_STATE;
-    }
 
     return result;
 }
@@ -962,6 +949,7 @@
             // Resume UF if appropriate
             if ( TRUE == salineBolusAutoResumeUF )
             {
+                salineBolusAutoResumeUF = FALSE;
                 currentUFState = UF_RUNNING_STATE;
             }
             // Resume dialysis