Merge branch 'bugfix/oauth-scopes-join' into 'develop'