Merge remote-tracking branch 'origin/main' into shared/external-renderer-masa