Added ConnectClientImpl
merged from github