Message updates
Merge remote-tracking branch 'origin/message-class'