Merge "Improved token decoder"