Merge remote-tracking branch 'origin/main' into 687-incorrect-metadata-read-index-in-omasa-ls-and-sh-rendering
