Merge branch 'oauth-login-failure-bug' into 'develop'