Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r6bd5b453f642257421e27d2f14cea5de3c3f6750 -rd9f36e25f1b5525c349e96adb3cf369f2bf6484e
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 6bd5b453f642257421e27d2f14cea5de3c3f6750)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision d9f36e25f1b5525c349e96adb3cf369f2bf6484e)
@@ -120,6 +120,7 @@
     { MSG_ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_REQUEST,          &bloodPrimeHandleBloodFlowChangeRequest },
     { MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST,                     &handleAutoLoadRequest },
     { MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST,             &handleAutoEjectRequest },
+    { MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE,                            &handleUpdateAvailable },
     { MSG_ID_TD_SOFTWARE_RESET_REQUEST,                                 &testTDSoftwareResetRequest },
     { MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,                                &testBubbleDetectOverride },
     { MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testBubblesDataPublishIntervalOverride },
@@ -202,7 +203,6 @@
     { MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST,         &testSyringePumpADCReadCounterOverride },
     { MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST,             &testHeparinBolusTargetRateOverride },
     { MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST,          &testCalibrateForceSensor },
-    { MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE,                            &handleUpdateAvailable },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))
Index: firmware/App/TDCommon.h
===================================================================
diff -u -r82833f6e61c29f1fd8222dbac69a88c50aa04673 -rd9f36e25f1b5525c349e96adb3cf369f2bf6484e
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 82833f6e61c29f1fd8222dbac69a88c50aa04673)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision d9f36e25f1b5525c349e96adb3cf369f2bf6484e)
@@ -37,7 +37,7 @@
 //    #define TEST_DEBUGGER                   1           // Testing with debugger - prevents FPGA comm alarms caused by breakpoints
 //    #define TEST_PROCESS_TASKS_WO_UI        1           // Allow task processing even when UI not connected
 //    #define TEST_UI_ONLY                    1           // Alpha test with TD and UI only - no DD
-      #define TEST_DISABLE_UI_ALARMS          1           // Disable UI alarms
+//    #define TEST_DISABLE_UI_ALARMS          1           // Disable UI alarms
 //    #define TEST_USE_OFF_AS_STOP_BUTTON     1           // Alpha test re-purposing off button as a stop button
 //    #define TEST_NO_PRESSURE_CHECKS         1             // Alpha test with no pressure sensor checks
 //    #define TEST_NO_STOP_CONSUME_CHECK      1           // Alpha test with no check for stop button timeout