Merge branch 'release/0.9.0' into develop
Switch off disabling tokens
Bump to 0.10.0
Merge branch 'release/0.10.0'