Merge 1.8.14 revision 25701 to cmake branch.