Merge Issue 11662 from 3.2 branch.