Fix OAuth2 issues.
Merge branch 'develop' into feature/plugins