Merge 1.8 revision 25648 to cmake branch.