Merge Issue 11662 from 3.1 branch.