please add 35425bafc772 to 5.9-stable