Merge remote-tracking branch 'origin/main' into rtp-updates-sa4-134