#11952: merge with 3.1.