Telemetry refactoring - companion first fixes