Merge pull request #6752 from MrPetovan/bug/notices