Merged from auth branch