Fix routing of CatchAll tokens
Merge pull request #911 from Daniel15/fix-catchall-routing

Fix routing of CatchAll tokens (Bug #17960)