Merge tag 'v4.0-rc5' into next