o Add a read-write lock for all client operations. Addresses: #4972