Merge 1.8 revision 25494 to cmake_branch