#17217: merge with 3.2.