Merge "Passing endpoint makes authenticate lazy so getting catalog fails."