Merge 1.8 revision 25512 to cmake_branch