Merge tag 'v6.2-rc3' into next