#710210 by rfay, Martin.Schwenke : Followup: Moved the token flush to places where it will work with more scenarios