Merge branch 'main' into 1444-conformance-scripts-ism-metadata-file-comparison-seems-to-be-line-ending-sensitive
