Merge pull request #16623 from mattwire/tokenvalues