Rebase 10.5 onto 78.6.0esr

be42732b

Edited by Matthew Finkel