Merge remote-tracking branch 'origin/main' into ci/optimize-renderer-test-set