Issue #19299 Change tokens to UUIDs can cleanup for pull request.