CXX-437 Backport server 2.8.0-rc1..2.8.0-rc2 changes

Ah, see it now. Cool