Add NO_MODULE_FILE
Merge branch 'refs/heads/develop'