-
Sergei Golubchik authored
Cherry-picking https://github.com/olesalscheider/server/commit/fc4df415049271ef625783c31f2999e7d1bdc816 (it was a 10.1 pull request, we want it in 5.5)
f1f8adf0
Cherry-picking https://github.com/olesalscheider/server/commit/fc4df415049271ef625783c31f2999e7d1bdc816 (it was a 10.1 pull request, we want it in 5.5)