Applied upstream as r1772