Changes to support concurrency in multi-threaded clients.