CXX-436 Backport server 2.8.0-rc0..2.8.0-rc1 changes