Merge remote-tracking branch 'remotes/origin/main' into 749-harmonize-ism-metadata-structures