Merge pull request #816 from nupplaphil/issue/6338-fix_notices