merge 2.7.14 release branch