Merge tag 'v3.17-rc5' from upstream