Merge pull request #6595 from annando/notice