* fix repeating the same message * cleanup * use blocking mode * check duplicate msg in test old-commit-hash: ee85e7026aefc6769a850c7cf1ce9a2f81b6402b
* fix repeating the same message * cleanup * use blocking mode * check duplicate msg in test old-commit-hash: ee85e7026aefc6769a850c7cf1ce9a2f81b6402b