Merge tag 'v3.9-rc3' into next