#14538: merge with 3.2.