#11979: merge with 3.1.