Rebase 10.0 patches onto 88.0.1

ef850626

Edited by Matthew Finkel