CXX-255 Backport server r2.7.1..r2.7.2 changes