CXX-338 Backport server r2.6.4..r2.6.5 changes