Merge "Make routers_client use **kwargs"