Merge branch 'main' into ci/ubsan-ignorelist