Index: firmware/App/Controllers/AlarmLamp.h
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Controllers/AlarmLamp.h	(.../AlarmLamp.h)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Controllers/AlarmLamp.h	(.../AlarmLamp.h)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -50,7 +50,7 @@
 void requestAlarmLampPattern( LAMP_PATTERN_T lampPattern );
 SELF_TEST_STATUS_T execAlarmLampTest( void );
 
-DATA_GET_PROTOTYPE( LAMP_PATTERN_T, getCurrentAlarmLampPattern );
+LAMP_PATTERN_T getCurrentAlarmLampPattern( void );
 BOOL getAlarmLampOn( void );
 
 BOOL testSetCurrentLampPatternOverride( U32 value );
Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r40a0bc77c53a4eb538580d44f1117d26f1d37fb2 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 40a0bc77c53a4eb538580d44f1117d26f1d37fb2)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -210,7 +210,7 @@
 static void checkBloodPumpFlowAgainstSpeed( void );
 static void checkBloodPumpMCCurrent( void );
 static void checkBloodFlowSensorSignalStrength( void );
-static DATA_GET_PROTOTYPE( U32, getPublishBloodFlowDataInterval );
+static U32  getPublishBloodFlowDataInterval( void );
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Controllers/Buttons.h
===================================================================
diff -u -rf3b83f75a19b975ad1abead662c8151a2907ac00 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision f3b83f75a19b975ad1abead662c8151a2907ac00)
+++ firmware/App/Controllers/Buttons.h	(.../Buttons.h)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -53,10 +53,10 @@
 BOOL isStopButtonPressed( void );
 void userConfirmOffButton( U08 response );
 SELF_TEST_STATUS_T execStuckButtonTest( void );
+
+BUTTON_STATE_T getOffButtonState( void );
+BUTTON_STATE_T getStopButtonState( void );
 
-DATA_GET_PROTOTYPE( BUTTON_STATE_T, getOffButtonState );
-DATA_GET_PROTOTYPE( BUTTON_STATE_T, getStopButtonState );
-
 BOOL testSetOffButtonStateOverride( U32 value );
 BOOL testResetOffButtonStateOverride( void );
 BOOL testSetStopButtonStateOverride( U32 value );
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r40a0bc77c53a4eb538580d44f1117d26f1d37fb2 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 40a0bc77c53a4eb538580d44f1117d26f1d37fb2)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -204,7 +204,7 @@
 static void checkDialInPumpFlowAgainstSpeed( void );
 static void checkDialInPumpMCCurrent( void );
 static void checkDialInFlowSensorSignalStrength( void );
-static DATA_GET_PROTOTYPE( U32, getPublishDialInFlowDataInterval );
+static U32  getPublishDialInFlowDataInterval( void );
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rb01542f8e4ef5a29e9b08fc0d465478de516bf02 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision b01542f8e4ef5a29e9b08fc0d465478de516bf02)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -185,7 +185,7 @@
 static void checkDialOutPumpSpeeds( void );
 static void checkDialOutPumpMCCurrent( void );
 
-static DATA_GET_PROTOTYPE( U32, getPublishDialOutDataInterval );
+static U32  getPublishDialOutDataInterval( void );
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r40a0bc77c53a4eb538580d44f1117d26f1d37fb2 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 40a0bc77c53a4eb538580d44f1117d26f1d37fb2)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -104,7 +104,7 @@
 static void checkVenousPressureInRange( void );
 static void checkOcclusions( void );
 static void publishPresOcclData( void );
-static DATA_GET_PROTOTYPE( U32, getPublishPresOcclDataInterval );
+static U32  getPublishPresOcclDataInterval( void );
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r1a685471524555a374854c0c9ec8e208e71fe2df -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -235,7 +235,7 @@
 static void setFPGAValveSetPoint( VALVE_T valve, S16 position, BOOL enableCurrentRelaxation );
 static void convertAndMonitorValvesCurrent( void );
 static void getAndMonitorValvesCurrentPosition( void );
-static DATA_GET_PROTOTYPE( U32, getPublishValvesDataInterval );
+static U32  getPublishValvesDataInterval( void );
 static void publishValvesData( VALVE_T valve );
 static void setValveNextStep( VALVE_T valve, U32 stepChange );
 
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r1a685471524555a374854c0c9ec8e208e71fe2df -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -704,13 +704,6 @@
         result = UF_RUNNING_STATE;
     }
 
-    // TODO - test code - remove later
-    if ( TRUE == isStopButtonPressed() )
-    {
-        resumeUF();
-        result = UF_RUNNING_STATE;
-    }
-
     return result;
 }
 
@@ -763,13 +756,6 @@
         }
     }
 
-    // TODO - test code - remove later
-    if ( TRUE == isStopButtonPressed() )
-    {
-        pauseUF();
-        result = UF_PAUSED_STATE;
-    }
-
     return result;
 }
 
Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r7325348a8b5fce9101d0f68d89c791d48e1a3575 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 7325348a8b5fce9101d0f68d89c791d48e1a3575)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -71,6 +71,8 @@
  *************************************************************************/
 U32 execFaultMode( void )
 {
+    BOOL stop = isStopButtonPressed();
+
 #ifndef EMC_TEST_BUILD
     // ensure all pumps are stopped
     signalBloodPumpHardStop();
@@ -86,7 +88,6 @@
     // TODO - EMC test code - remove later
     static U32 toggle = 0;
     static BOOL button_state = FALSE;
-    BOOL stop = isStopButtonPressed();
 
     if ( TRUE == stop )
     {
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r0fce4283f8f28da957f9e82ec121efbc6ee55241 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 0fce4283f8f28da957f9e82ec121efbc6ee55241)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -64,6 +64,11 @@
 {
     treatStartReqReceived = FALSE;
 
+    // set user alarm recovery actions allowed in this mode
+    setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
+    setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
+    setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
+
 #ifdef RM46_EVAL_BOARD_TARGET
     start = getMSTimerCount();
 #endif
@@ -80,11 +85,6 @@
 {
     BOOL stop = isStopButtonPressed();
 
-    // set user alarm recovery actions allowed in this mode
-    setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
-    setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
-    setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
-
 #ifndef DISABLE_UI_TREATMENT_WORKFLOW
     if ( TRUE == treatStartReqReceived )
 #endif
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r7325348a8b5fce9101d0f68d89c791d48e1a3575 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 7325348a8b5fce9101d0f68d89c791d48e1a3575)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -270,14 +270,17 @@
  *************************************************************************/
 U32 execTreatmentMode( void )
 {
-#ifdef DISABLE_UI_TREATMENT_WORKFLOW
     BOOL stop = isStopButtonPressed();
 
     if ( TRUE == stop )
     {
+#ifndef DISABLE_UI_TREATMENT_WORKFLOW
+        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+#else
         requestNewOperationMode( MODE_POST );
-    }
 #endif
+    }
+
     // treatment mode state machine
     switch ( currentTreatmentState )
     {
Index: firmware/App/Modes/ModeTreatmentParams.c
===================================================================
diff -u -r7325348a8b5fce9101d0f68d89c791d48e1a3575 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision 7325348a8b5fce9101d0f68d89c791d48e1a3575)
+++ firmware/App/Modes/ModeTreatmentParams.c	(.../ModeTreatmentParams.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -388,6 +388,20 @@
 
 /*********************************************************************//**
  * @brief
+ * The validateAndSetUFVolume function validates received ultrafiltration
+ * volume treatment parameter.
+ * @details Inputs: none
+ * @details Outputs:
+ * @param params payload record from treatment parameters message received from UI
+ * @return TRUE if received treatment parameters are valid, FALSE if not
+ *************************************************************************/
+BOOL validateAndSetUFVolume( F32 uFVolumeMl )// user provided ultrafiltration volume to be set and validated
+{
+
+}
+
+/*********************************************************************//**
+ * @brief
  * The validateAndSetTreatmentParameters function validates received
  * treatment parameters.
  * @details Inputs: none
Index: firmware/App/Modes/ModeTreatmentParams.h
===================================================================
diff -u -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision f6888c7e4e05cb84b11fceb4340458d8af543ce8)
+++ firmware/App/Modes/ModeTreatmentParams.h	(.../ModeTreatmentParams.h)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -76,11 +76,13 @@
 U32  execTreatParamsMode( void );                                                   // execute the treatment parameters mode state machine (call from OperationModes)
 
 BOOL validateAndSetTreatmentParameters( TREATMENT_PARAMS_DATA_PAYLOAD_T params );   // user provided treatment params to be set and validated
-BOOL signalUserConfirmationOfTreatmentParameters( void );                           // User has confirmed treatment parameters
-BOOL signalUserRejectionOfTreatmentParameters( void );                              // User has rejected treatment parameters
-BOOL signalUserCancelTreatment( void );                                             // User has cancelled treatment
+BOOL signalUserConfirmationOfTreatmentParameters( void );                           // user has confirmed treatment parameters
+BOOL signalUserRejectionOfTreatmentParameters( void );                              // user has rejected treatment parameters
+BOOL signalUserCancelTreatment( void );                                             // user has cancelled treatment
 void signalAlarmActionToTreatParamsMode( ALARM_ACTION_T action );                   // execute alarm action as appropriate for treatment parameters mode
 
+BOOL validateAndSetUFVolume( F32 uFVolumeMl );                                      // user provided ultrafiltration volume to be set and validated
+
 BOOL setTreatmentParameterU32( TREATMENT_PARAM_T param, U32 value );                // Set a specified unsigned integer treatment parameter value
 BOOL setTreatmentParameterS32( TREATMENT_PARAM_T param, S32 value );                // Set a specified signed integer treatment parameter value
 BOOL setTreatmentParameterF32( TREATMENT_PARAM_T param, F32 value );                // Set a specified floating point treatment parameter value
Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r1a685471524555a374854c0c9ec8e208e71fe2df -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -74,11 +74,7 @@
  *************************************************************************/
 void execTreatmentStop( void )
 {
-    // TODO - test code - remove later
-    if ( TRUE == isStopButtonPressed() )
-    {
-        requestNewOperationMode( MODE_POST );
-    }
+    // TODO - implement
 }
 
 /**@}*/
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rc672f41061bcd500d6593655641cb27ce3ae58fc -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c672f41061bcd500d6593655641cb27ce3ae58fc)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -1203,6 +1203,10 @@
             handleChangePressureLimitsRequest( message );
             break;
 
+        case MSG_ID_UI_SET_UF_VOLUME_PARAMETER:
+            handleUFVolumeSetRequest( message );
+            break;
+
         default:
             // TODO - unrecognized message ID received - ignore
             break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r7325348a8b5fce9101d0f68d89c791d48e1a3575 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7325348a8b5fce9101d0f68d89c791d48e1a3575)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -775,7 +775,7 @@
  * @param almData2 2nd data associated with alarm
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 )
+BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -784,10 +784,10 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_TRIGGERED;
-    msg.hdr.payloadLen = sizeof( U16 ) + sizeof( U32 ) * 2 * 2;   // 2 alarm data recs w/ 2 32-bit values each
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) * 2 * 2;   // 2 alarm data recs w/ 2 32-bit values each
 
-    memcpy( payloadPtr, &alarm, sizeof( U16 ) );
-    payloadPtr += sizeof( U16 );
+    memcpy( payloadPtr, &alarm, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, &almData1.dataType, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, &almData1.data, sizeof( U32 ) );
@@ -811,7 +811,7 @@
  * @param alarm ID of alarm cleared
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastAlarmCleared( U16 alarm )
+BOOL broadcastAlarmCleared( U32 alarm )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -820,9 +820,9 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_CLEARED;
-    msg.hdr.payloadLen = sizeof( U16 );
+    msg.hdr.payloadLen = sizeof( U32 );
 
-    memcpy( payloadPtr, &alarm, sizeof( U16 ) );
+    memcpy( payloadPtr, &alarm, sizeof( U32 ) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_ALARM, ACK_REQUIRED );
@@ -840,7 +840,7 @@
  * @param alarm ID of alarm that has had it's condition cleared
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastAlarmConditionCleared( U16 alarm )
+BOOL broadcastAlarmConditionCleared( U32 alarm )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -849,9 +849,9 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_CONDITION_CLEARED;
-    msg.hdr.payloadLen = sizeof( U16 );
+    msg.hdr.payloadLen = sizeof( U32 );
 
-    memcpy( payloadPtr, &alarm, sizeof( U16 ) );
+    memcpy( payloadPtr, &alarm, sizeof( U32 ) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_ALARM, ACK_REQUIRED );
@@ -1269,14 +1269,14 @@
  *************************************************************************/
 void handleAlarmTriggered( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == ( sizeof( U16 ) + sizeof( U32 ) * 2 * 2 ) )  // 2 data records w/ 2 U32s each
+    if ( message->hdr.payloadLen == ( sizeof( U32 ) + sizeof( U32 ) * 2 * 2 ) )  // 2 data records w/ 2 U32s each
     {
         U08 *payloadPtr = message->payload;
-        U16 alarmID;
+        U32 alarmID;
         ALARM_DATA_T alm1, alm2;
 
-        memcpy( &alarmID, payloadPtr, sizeof( U16 ) );
-        payloadPtr += sizeof( U16 );
+        memcpy( &alarmID, payloadPtr, sizeof( U32 ) );
+        payloadPtr += sizeof( U32 );
         memcpy( &alm1.dataType, payloadPtr, sizeof( U32 ) );
         payloadPtr += sizeof( U32 );
         memcpy( &alm1.data, payloadPtr, sizeof( U32 ) );
@@ -1302,12 +1302,12 @@
  *************************************************************************/
 void handleAlarmCleared( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof( U16 ) )
+    if ( message->hdr.payloadLen == sizeof( U32 ) )
     {
         U08 *payloadPtr = message->payload;
-        U16 alarmID;
+        U32 alarmID;
 
-        memcpy( &alarmID, payloadPtr, sizeof( U16 ) );
+        memcpy( &alarmID, payloadPtr, sizeof( U32 ) );
 
         if ( (ALARM_ID_T)alarmID < NUM_OF_ALARM_IDS )
         {
@@ -1326,12 +1326,12 @@
  *************************************************************************/
 void handleAlarmUserAction( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof( U16 ) )
+    if ( message->hdr.payloadLen == sizeof( U32 ) )
     {
         U08 *payloadPtr = message->payload;
-        U16 action;
+        U32 action;
 
-        memcpy( &action, payloadPtr, sizeof( U16 ) );
+        memcpy( &action, payloadPtr, sizeof( U32 ) );
 
         if ( (ALARM_USER_ACTION_T)action < NUMBER_OF_ALARM_USER_ACTIONS )
         {
@@ -1762,6 +1762,65 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleUFVolumeSetRequest function handles a UF volume treatment parameter
+ * set and validate request message from the UI.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleUFVolumeSetRequest( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof(F32) )
+    {
+        F32 uFVolumeMl;
+
+        memcpy( &uFVolumeMl, message->payload, sizeof(F32) );
+
+        result = validateAndSetUFVolume( uFVolumeMl );
+    }
+
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendUFVolumeSetResponseMsg function constructs a UF volume treatment parameter
+ * response to the UI and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: UF volume treatment parameter response msg constructed and queued.
+ * @param accepted T/F - is UF volume setting accepted?
+ * @param rejectReasons reason UF volume setting was rejected (if not accepted)
+ * @param uFVolumeMl UF volume (in mL) value that is now in place
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendUFVolumeSetResponseMsg( BOOL accepted, U32 reason, F32 uFVolumeMl )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE;
+    msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ) + sizeof( F32 );
+
+    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
+    payloadPtr += sizeof( BOOL );
+    memcpy( payloadPtr, &reason, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &uFVolumeMl, sizeof( F32 ) );
+
+    // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );
+
+    return result;
+}
+
 /*********************************************************************//**
  * @brief
  * The handleChangeUFSettingsRequest function handles a ultrafiltration
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r85ab84d9a0668e1e3976b00eb29e79c38c81b651 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 85ab84d9a0668e1e3976b00eb29e79c38c81b651)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -105,6 +105,12 @@
 // MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE
 BOOL sendTreatmentParametersResponseMsg( BOOL rejected, U08 *rejectReasons, U32 byteLength );
 
+// MSG_ID_UI_SET_UF_VOLUME_PARAMETER
+void handleUFVolumeSetRequest( MESSAGE_T *message );
+
+// MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE
+BOOL sendUFVolumeSetResponseMsg( BOOL accepted, U32 reason, F32 uFVolumeMl );
+
 // MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS
 void handleUIUserConfirmTreatmentParameters( MESSAGE_T *message );
 
@@ -184,13 +190,13 @@
 BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
 
 // MSG_ID_ALARM_TRIGGERED
-BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
+BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
 
 // MSG_ID_ALARM_CLEARED
-BOOL broadcastAlarmCleared( U16 alarm );
+BOOL broadcastAlarmCleared( U32 alarm );
 
 // MSG_ID_ALARM_CONDITION_CLEARED
-BOOL broadcastAlarmConditionCleared( U16 alarm );
+BOOL broadcastAlarmConditionCleared( U32 alarm );
 
 // MSG_ID_BLOOD_FLOW_DATA
 BOOL broadcastBloodFlowData( BLOOD_PUMP_STATUS_PAYLOAD_T *bloodData );
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -rce3e0696642099164fa482c864509c67ce65579b
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision ce3e0696642099164fa482c864509c67ce65579b)
@@ -57,7 +57,7 @@
 static void resetWDTaskCheckIns( void );
 static BOOL haveAllTasksCheckedIn( void );
 static void petWatchdog( void );
-static DATA_ARRAY_GET_PROTOTYPE( BOOL, hasTaskGeneralCheckedIn, task );
+static BOOL hasTaskGeneralCheckedIn( U32 task );
 
 /*********************************************************************//**
  * @brief