Merge "Add a bit more debugging to the client registry"