Merge pull request #21134 from eileenmcnaughton/tok_nearly