chore: sync develop with main after v1.17.2#604

unjica merged 2 commits into

developTelemetry-Tracker/telemetry-tracker:developfrom

sync/main-v1.17.2-into-developTelemetry-Tracker/telemetry-tracker:sync/main-v1.17.2-into-developCopy head branch name to clipboard