merge from 2.7 release branch