Merge 1.8 revision 25409 to cmake branch