Merge branch 'main' into ci/test-remove-renderer-short