Merge "fix oauth code"