CXX-273 Backport server r2.6.2..r2.6.3 changes