Cherry–picked new endpoints.