Merge pull request #6746 from nupplaphil/issue/6338-notices