CXX-170 Backport server 2.6.0-rc3..2.6.0 changes