Merge branch 'release/0.9.5'
Merge branch 'release/0.9.6'
better offline handling
version bump
Merge branch 'hotfix/0.9.7' into develop