Merge pull request #1699 from CircleCI-Public/cs/rc-gen-token