merge 2.7.13 release branch