Merge tag 'v4.0-rc1' into patchwork