fix: Merge main into v2

[Samoed]

Checklist

• [X] Run tests locally to make sure nothing is broken using make test.
• [X] Run the formatter to format the code using make lint.