Merge pull request #18657 from eileenmcnaughton/token_2