Merge branch 'main' into 925-generate-coverage-for-short-test-vectors-as-part-of-coverage-job