Merge "let addCleanup use the current client"