Merge branch 'release/0.6.0' into develop
Forgot to add privates/implementations
Merge branch 'release/0.6.0'