Rebase 10.0 patches onto 78.8.0esr

bace0d2a

Edited by Matthew Finkel