Issue #2731425 by james.williams, steven jones, anybody: Lots of unnecessary...

Issue #2731425 by james.williams, steven jones, anybody: Lots of unnecessary querying for custom tokens

Closes #2731425

restored source branch 2731425-lots-of-unnecessary

added 1 commit

• 4821a50a - Issue #2731425 by james.williams, steven jones, anybody: Lots of unnecessary...

Compare with previous version

added 3 commits

• 4821a50a...19a57b79 - 2 commits from branch project:8.x-1.x
• 40e2fc2b - Issue #2731425 by james.williams, steven jones, anybody: Lots of unnecessary...

Compare with previous version

merged