Removed old code
Merge remote-tracking branch 'origin/notifications' into staging
Update security
Merge remote-tracking branch 'origin/notifications' into staging
Updated email 'From'
Merge remote-tracking branch 'origin/notifications' into staging