wloot yes, ultimately that PR should fix the issue(s). I'm hoping to getting it shipped with the next beta.
As discussed in the GitHub issue, I don't think there is a significant security risk keeping the tokens. But you could manually delete the older one if you want to make some space and reduce the risks.
