Merge pull request #8179 from MrPetovan/bug/notices