Merge tag 'v3.6-rc2' into next