Merge pull request #511 from andrerod/dev

Update wrappers
Merge pull request #513 from andrerod/dev

Regenerate network client
Merge remote-tracking branch 'upstream/dev' into dev