Merge tag 'v3.9-rc2' into next