Merge tag 'v3.17-rc3' into next