Applied upstream as r3062