Merge 1.8 revision 25637 to cmake branch.