Merge pull request #6753 from MrPetovan/bug/notices