Merge pull request #6781 from nupplaphil/task/mod_feedtest