Fixing bug and typo
Merge branch 'feature/oauth' into feature/oauth_dependencies