Merge 1.8.14 to cmake branch