Match upstream project-service changes.