Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff -r6d85a90d2325163e936055a620a8b6aa1a6db65a
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 2652d50bbc5e78ed6fe3ad9ccbca0be6f802f1ff)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 6d85a90d2325163e936055a620a8b6aa1a6db65a)
@@ -1,6 +1,5 @@
 
 
-
 #include <string.h>        // for memcpy()
 
 #include "BoostPump.h"
@@ -73,6 +72,9 @@
 static const MSG_HANDLER_LOOKUP_T MSG_FUNCTION_HANDLER_LOOKUP[] = {
 {  MSG_ID_FP_TESTER_LOGIN_REQUEST,                                 &handleTesterLogInRequest },
 {  MSG_ID_FP_SOFTWARE_RESET_REQUEST,                               &handleROSoftwareResetRequest },
+{  MSG_ID_FW_VERSIONS_REQUEST,                                     &handleVersionRequestMessage },
+{  MSG_ID_DD_FP_START_STOP_CMD_REQUEST,                            &handleGenerateWaterRequestMsg },
+{  MSG_ID_FP_RO_PUMP_STOP_REQUEST,                                 &testROPumpHardStop },
 {  MSG_ID_FP_SEND_TEST_CONFIGURATION,                              &handleROTestConfiguration },
 {  MSG_ID_FP_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testValvesStatesPublishIntervalOverride },
 {  MSG_ID_FP_VALVE_CMD_STATE_OVERRIDE_REQUEST,                     &testValveStateOverride },
@@ -98,7 +100,6 @@
 {  MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                   &testConductivitySensorTemperatureReadingsOverride },
 {  MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,             &testConductivitySensorReadCounterOverride },
 {  MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,            &testConductivitySensorErrorCounterOverride },
-{  MSG_ID_DD_FP_START_STOP_CMD_REQUEST,                            &handleGenerateWaterRequestMsg },
 {  MSG_ID_FP_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,            &testPreGenDataPublishIntervalOverride },
 {  MSG_ID_FP_SET_OPERATION_MODE_REQUEST,                           &testSetOperationMode },
 {  MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testTemperatureSensorsDataPublishIntervalOverride },
@@ -110,8 +111,6 @@
 {  MSG_ID_FP_BOOST_PUMP_TARGET_FLOW_OVERRIDE_REQUEST,              &testBoostPumpTargetFlowOverride },
 {  MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST,               &testBoostPumpTargetDutyCycleOverride },
 {  MSG_ID_FP_BOOST_PUMP_STOP_REQUEST,                              &testBoostPumpHardStop },
-{  MSG_ID_FP_RO_PUMP_STOP_REQUEST,                                 &testROPumpHardStop },
-{  MSG_ID_FW_VERSIONS_REQUEST,                                     &handleVersionRequestMessage },
 {  MSG_ID_FP_SAFETY_SHUTDOWN_OVERRIDE_REQUEST,                     &testSetResetSafetyShutdownOverride },
 {  MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST,                         &testAlarmStateOverride },
 {  MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST,                       &testClearAllAlarms },