Rebase 11.0 patches onto 92.0b9

1be59216 .

Edited by Matthew Finkel