some attempts to fix push notifs
Merge remote-tracking branch 'origin/master'