Merge 2.7.9 release branch