Merge "Add ComputeClient for cleanup"