Merge tag 'v3.4-rc7' into for-3.5