#11985: merge with 3.2.