Merge tag 'v0.1.21' into develop

Improved dump configuration
Improved service provider
bump version
Merge branch 'release/v0.1.22'