You should look into this module for token support.
https://www.drupal.org/project/token_filter â
The patch make sense and should have no risk to merge.