Pull upstream and AuthCanceled Fix