Merge branch 'hotfix/hotfix'
Notification query fix
Permissions fix
Merge branch 'hotfix/hotfix' into develop