chore: sync main to next

Merge branch 'main' into next