Merge tag 'v4.18-rc2' into next-general