Merge pull request #9724 from MrPetovan/bug/notices