Merge tag 'v3.4-rc5' into next