revert refactor
Merge branch 'hotfix/revert_refactor' into next
version bump
Merge branch 'release/v0.0.8' into next