Create a message on notification
Merge remote-tracking branch 'origin/master' into notificationpage-306