Merge "Fix double auth issue"