Users/tedeshpa/improve telemetry further #170

Closed tejasd1990 closed 5 years ago