Cherry pick from a different fork