Rebase 10.5 patches on 88.0