Revert "Revert "commontoken""

This reverts commit bc2bac727730d0c4209d79272de363bab15cb84e.
fix CommonToken Bug