CXX-197 Backport server r2.6.0..r2.6.1 changes