Use Compat notif builder
Fix bug when creating uuid
Merge branch 'dev'