Account notifications
Merge branch 'hotfix/hotfix' into develop