CXX-337 Backport server r2.7.5..r2.7.6