Merge pull request #1702 from CircleCI-Public/cs/rc-delete-uuid