Merge branch 'main' into shared/external-renderer-masa

Includes some minor fixes during merge conflict resolution.