#16152: merge with 3.2.