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