(issue #3904) emergency fix if needed
(issue #3904) cleaner implementation
(issue #3904) update helper function
Merge pull request #3904 from sathomas/issue3904

Push notification error