dirty hack to auto apply token
Merge branch 'auto-apply-token' into apio