Merge "Remove calls to client while holding lock" into tm-qpr-dev