Merge "Endpoints"