Merge 1.8 revision 25498 to cmake_branch