add message log
Merge branch 'master' into dev
better error message
better error message
Merge remote-tracking branch 'cloudwu/dev'