Wholesale reset modules
Merge branch 'master' into stackhammer-reidmv-master