sync: main to dev

[github-actions[bot]]

sync-branches: New code has just landed in main, so let's bring dev up to speed!