#11910: merge with 3.1.