Merge "fix import for default clients in clients.py"