update message
Merge branch 'topic'
update message.