update Gonville
fix #25405
fix #25410
fix regression