#14875: merge with 3.2.