Rebase 10.5 patches onto 85.0