CXX-275 Backport server r2.7.2..r2.7.3 changes