Merge tag 'v3.8-rc7' into next