Added check for duplicate messages
Merge branch 'hotfix/remove_duplicate_messages'