Fix notification syntax for messages
Merge remote-tracking branch 'origin/master' into r2-candidate