Merge branch 'hotfix/hotfix'
Notification mail with notification archived
Merge branch 'hotfix/hotfix' into develop