Rebase 11.0 patches onto 91.0
e0fdc6e4