Merge branch 'main' into ci/report-pytest-error-for-renderer-tests