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