adding random to token and including the whole path when creating the token
Merge branch 'IX-9.0.0-P-119904' into IX-9.0.0