Add token entities
Bumpt to version 3.9.0-alpha.15