Merge tag 'v3.6-rc7' into next