Merge pull request #917 from nupplaphil/task/reduce_app_deps