Merge pull request #7438 from colemanw/insertToken