Merge branch 'fix-cmake-server-bad-buffering' into release-3.10

Merge-request: !1498