Rebase 10.5 patches onto 78.15.0

Edited by Matthew Finkel