Merge tag 'v6.1-rc1' into next