#14236: merge with 3.2.