Merge tag 'v4.10-rc1' into docs-next