merge from master
Merge branch 'master' into yifan
change on workernode
Merge branch 'master' into yifan
resultmsg changed on Message.java