Made output modules explicit pack dependencies
Merge branch 'dev' into ms