#17789: merge with 3.3.