#11997: merge with 3.2.