Issue #3305407: Better token support

Dave Reid requested to merge issue/representative_image-3305407:3305407-better-token-support into 8.x-1.x Aug 23, 2022