Merge tag 'v3.16-rc5' into next/fixes-non-critical