CXX-850 Backport server r3.0.9..r3.0.12 changes
Server SHAs cherry-picked (with modifications) into this commit: e5f5b4e 5c2737d
parent
7fad3fd9
Server SHAs cherry-picked (with modifications) into this commit: e5f5b4e 5c2737d
mentioned in commit 72023b86
·mentioned in commit 72023b86