Merge branch 'main' into 457-review-tests-for-use-of-ism-extended-metadata-modes