Sync main v1.17.1 into develop#601

unjica merged 2 commits into

developTelemetry-Tracker/telemetry-tracker:developfrom

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