#14763: merge with 3.2.