Merge branch 'package2module' into wip