Merge branch 'module-complete'