Merge "Reduce size of TOKENEXTRA struct"