Merge branch 'main' into deduplicate-renderer-tests