Add specs to make sure consecutive runs of the generator behave correctly
Merge branch 'hotfix/1.2.0' into develop
Merge branch 'hotfix/1.2.0'
Merge branch 'develop'

* develop: