possible emitted token types
auto-merge staging into master