Merge pull request #6750 from nupplaphil/task/module_apps