Fixed: Issue saving notifications
Merge branch 'develop'