#14289: merge with 3.2