CXX 301 Backport server r2.7.3..r2.7.4 changes

No need to really review, just doing this for historical reasons.