Merge branch 'release/0.0.8' into feature/CleanUp
Merge branch 'feature/CleanUp' into release/0.0.8