CXX-274 Backport server r2.6.3..r2.6.4 changes