Merge issue 11662 from 2.5.