Merge branch 'release/0.5.0' into develop
regenrate to follow jenerator changes
Bump version
Merge branch 'release/0.5.1'