Fix notification issues
Merge branch 'master' into notifications-fix
Comments
Small fixes
Removed unnecessary new map
Merge branch 'master' into notifications-fix
Merge pull request #240 from g-ortuno/notifications-fix

Notifications fix
lgtm