This is the same patch as in #6, except with ECHO split to ECHO (notifications) and ECHO_ERROR (used for the command not supported message).
This is the same patch as in #6, except with ECHO split to ECHO (notifications) and ECHO_ERROR (used for the command not supported message).