Merge branch 'hotfix/messages'
Fixed winning
Merge branch 'hotfix/winning' into develop