Merge "Make docstring of servers consistent"