Taras wip

update master with the latest from taras's telemetry-frontend master branch