Applied upstream as r1756