MLHR-800 #resolve #comment data map should be cleared after emit the
data
Merge pull request #735 from siyuanh/master

MLHR-800 #resolve #comment data map should be cleared after emit the data