Merge branch 'main' into add-missing-jobs-to-coverage