Merge pull request #1792, fix zk unsubscribe issue.