telemetry changes backported from telemetry_2.2 branch