Tag each request with a uuid and the user id
Merge branch 'master' into develop - pulls in sofa bugfixes
Tag requests with uuid/user-id