Keep OAuth2 functionality in one branch