#16478: merge with 3.2.