merge 2.7 release branch