Merge pull request #19715 from mattwire/tokenclean