Add UUID to random tokens

Closes #3573046

Merge request reports

Loading