user history use user id
Merge remote-tracking branch 'origin/master' into mcphi