#14770: merge with 3.2.