Merge branch 'oauth-handler-implementation' of https://github.com/git…

Merge branch 'oauth-handler-implementation' of https://github.com/git… #6241