Merge tag 'v4.18-rc6' into for-4.19/block2