Rebase 10.0 onto 78.6.0esr

Edited by Matthew Finkel