Merge 1.8.14 revision 25682 to cmake branch.