Support module_name option/spec-metadata
Merge branch 'module_name'