Merge remote-tracking branch 'origin/main' into 795-metadata-file-comparison-for-ext-output-not-working-in-self-test-comparison
