Remove isModule
Merge branch 'develop'