Fix concatenation of msgs
Fix msgs bug
Merge branch 'master' into develop