Merge pull request #7258 from annando/fix-notice