Merge tag 'v3.16-rc6' into next