#14114: merge with 3.2.