Add generated id to messages
Merge branch 'master' into plugins