CMessage
Merge branch 'msg'