this is why tests are great
merge 2.7.9 release branch