Merge "[BugFix][Fingerprint]fix client was canceled by service by mistake"