Merge branch 'main' into ci/fix-renderer-test-utils