Merge "Add more detail info to EndpointNotFound"