Rebase 11.0 patches on 91.0b5

4fc4d759

Edited by Matthew Finkel