Rebase patches onto 85.0b9-build1

Edited by Matthew Finkel