Merge 1.8 revision 25662 to cmake branch.