Merge in client library.