Merge "service/client: implement connect and disconnect methods"