#14535: merge with 3.2.