Merge "Do not set alias user_client for specific client"