Merge "OAuth2 support"