Applied upstream as r2577