#25517: merge with 3.5.