Merge branch 'main' into basop-2257-assert-in-omasa-pre-renderer-2