Merge branch 'main' into ci/fix-error-patterns-for-correct-error-percentage