Merge branch 'hotfix/notification-migration' into 'develop'