#17493: merge with 3.2.