CXX-370 Backport server r2.7.7..r2.7.8