Fix from 'master' ported to the new telemetry system