Ensure token char size matches Constants definition of size.
Merge branch 'master' into oracle