Rebase 10.5 patches on 87.0

4068febf

Edited by Matthew Finkel