Merge "New endpoint"