OR-720 Add user resolver on run
Merge pull request #500 in OR/rse from OR/rse-chamerling:OR-720 to master

* commit 'b9c2883044544678537d410f56fc822574abfb65':
  OR-720 Add user resolver on run