[DIY-53] added replacement for token