- multiple vocab support
- cleanup
Merge origin/feature/generator-update into feature/generator-update