CXX-77 Backport relevant server repo changes applied between rc0 and rc1

See the comment in CXX-77 for how this was produced.