Merge branch 'main' into 34-bug-in-masa-format-ext-output-spherical-indexing