version of c9b3a00a63 for the server platform (cherry picked from commit 6a146d405c)
c9b3a00a63
6a146d405c