#17402: merge with 3.2.