Merge 1.8 revision 25553 to cmake branch