Merge pull request #21341 from demeritcowboy/token-time