CXX-339 Backport server r2.7.6..r2.7.7 changes