Merged auth branch