Applied upstream as r1896