Merge branch 'main' into fix/fuzzing-crashes