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