Merge 1.8.14 revision 25729 to cmake branch.