Sync main v1.17.3 into develop#607

unjica merged 2 commits into

developTelemetry-Tracker/telemetry-tracker:developfrom

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