Merge branch 'hotfix/hotfix'
Notifications fix
Merge branch 'hotfix/hotfix' into develop