Fix Token Translation
Merge branch 'Fix-Token-Translation'