generator refactoring...
Merge branch 'feature/refactor-generator-bundle' into develop

* feature/refactor-generator-bundle:
  generator refactoring...