Merge pull request #5719 from annando/notices-yeah