Merge branch 'release/0.7.3' into develop
Improved token retry handling (to make it work)
Bump to 0.7.4
Merge branch 'release/0.7.4'