Messages update [bug fixes]
Merge remote-tracking branch 'origin/master'