Merge remote-tracking branch 'origin/main' into 1174-indexing-bug-in-masa-mcmasa-function-reduce_metadata_further
