Merge OAuth into API branch