Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb1c2d54d3d029ab1340d91193a7a4c81db8ba29d -rdbcbd145954ef52510ac929a412e0dba42f0941b
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b1c2d54d3d029ab1340d91193a7a4c81db8ba29d)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision dbcbd145954ef52510ac929a412e0dba42f0941b)
@@ -1390,6 +1390,10 @@
                 handleTestDialOutFlowSetPointOverrideRequest( message );
                 break;
 
+            case MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestHDValvesBroadcastIntervalOverrideRequest( message );
+                break;
+
             case MSG_ID_HD_VALVES_HOME:
                 handleHomeHDValve( message );
                 break;
@@ -1402,9 +1406,11 @@
                 handleSetHDValvePositionOverrideRequest( message );
                 break;
 
+#ifdef DEBUG_ENABLED
             case MSG_ID_HD_VALVES_SET_PWM_OVERRIDE:
                 handleSetHDValvePWMOverrideRequest( message );
                 break;
+#endif
 
             default:
                 // TODO - unrecognized message ID received - ignore