Merge branch 'main' into 786-error-reading-ism-metadata-files