Merge pull request #8469 from MrPetovan/bug/notices