Merge branch 'user-results'
Merge branch 'master' into whitelist