Merge branch 'main' into ci/updates_renderer_tests