Merge pull request #7172 from nupplaphil/task/mod_notice_rm