Add fallback to telemetry
Merge pull request #825 from yurydelendik/telemetry-fallback

Add fallback to telemetry