Fixes #4598 Better UUID to avoid visitor collision on same second + same configs
Merge remote-tracking branch 'origin/master'