Merge branch 'main' into kiene/ubsan-error-reporting