the c/s protocol will change with next commit, so we need a new 4.X (cherry picked from commit f4a0d7cb) backport to 4.11.1