Pull in some more code from telemetry
Version 1.1.0