Merge pull request #5743 from MrPetovan/bug/fix-empty-notifications