Merge tag 'v3.17-rc1' into patchwork