Merge branch 'main' into add-release-channel-information-to-telemetry-events