Merge branch 'main' into ci/deduplicate-renderer-tests