CXX-151 Backport server rc2..rc3 changes