merge 2.7.7 release branch