fix: ensure the normal Basic CC values are only exposed if they should be, even with the compat event enabled

fix: ensure the normal Basic CC values are only exposed if they should be, even with the compat event enabled #15031