Merge branch 'scan-telemetry' into preload-maps