Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'