#16433: merge with 3.2.