Merge branch 'release/0.8.5' into develop
Fix token issue
Bump to 0.9.0
Merge branch 'release/0.9.0'