Rebase 10.5 patches onto 78.15.0

21e3ca02

Edited by Matthew Finkel