#24789: merge with 3.5.