expand @ symbols in tokens

refs: #8478
Merge pull request #8490 from rolandwalker/expand_at_token

expand `@` symbols in tokens