Update messages for new updates
Merge branch 'test'