CXX-126 Backport rc1..rc2 changes

CXX-126 Backport relevant server repo changes applied between rc1 and rc2