Merge pull request #7659 from keymanapp/fix/developer/7658-handle-unpaired-surrogate-in-token-command fix(developer): handle unpaired surrogate