Fixed generator
Merge branch 'hotfix/2.10.2'

* hotfix/2.10.2:
  Fixed generator