Merge tag 'v3.8-rc2' into next