Merge "Fix client.rst"