Merge pull request #3356 from Hypolite/issue/fix-notifications-display