Merge branch 'main' into 830-Enable-parallelized-test-runs-in-coverage-test