Merge branch 'main' into renderer-smoke-test-basop