Merge branch 'main' into ci/disable-coverage