Merge pull request #6833 from MrPetovan/bug/notices