Issue #1158636 by ravuriharish, Hanno, drupalisme, rolkos, robertom, julien.reulos: Fix tokens rewrite