Merge changes I248f2634,I9bf626f2

* changes:
  Move #addToken and #hasToken into Rollback (2/n)
  Remove a NewRollback immediately when cancelled (1/n)