Rebase 10.0 patches onto 89.0
3862f777