Merge branch 'hotfix/1.0b4.2'
fix generator directory based on namespace
Merge branch 'hotfix/1.0b4.3' into develop