fix duplicate message bug
Merge branch '0.9' into 0.9-debug