CXX-308 Backport server r2.7.4..r2.7.5 changes