Merge in client library