Rebase 11.0 patches onto 92.0